diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-04 09:09:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 09:09:10 +0200 |
| commit | 4a2aeb152e48c44efa57c140660e99792f4dd350 (patch) | |
| tree | 7b786de2b175122814a53232268b1147a8bd0bfb /accessible/windows | |
| parent | 20532e13937ab5fc8efcb2bfc4c0070dace40cd1 (diff) | |
| parent | f265784e8cabaff17f4554cf2bd2c30217b6ec0f (diff) | |
| download | UXP-4a2aeb152e48c44efa57c140660e99792f4dd350.tar UXP-4a2aeb152e48c44efa57c140660e99792f4dd350.tar.gz UXP-4a2aeb152e48c44efa57c140660e99792f4dd350.tar.lz UXP-4a2aeb152e48c44efa57c140660e99792f4dd350.tar.xz UXP-4a2aeb152e48c44efa57c140660e99792f4dd350.zip | |
Merge pull request #323 from MoonchildProductions/nuke-sandbox
Nuke sandbox
Diffstat (limited to 'accessible/windows')
| -rw-r--r-- | accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp | 27 | ||||
| -rw-r--r-- | accessible/windows/msaa/HTMLWin32ObjectAccessible.h | 7 |
2 files changed, 0 insertions, 34 deletions
diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp b/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp index 3644db68d..75a6f647b 100644 --- a/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp +++ b/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp @@ -62,25 +62,6 @@ HTMLWin32ObjectAccessible::HTMLWin32ObjectAccessible(void* aHwnd, { mHwnd = aHwnd; if (mHwnd) { -#if defined(MOZ_CONTENT_SANDBOX) - if (XRE_IsContentProcess()) { - DocAccessibleChild* ipcDoc = aDoc->IPCDoc(); - MOZ_ASSERT(ipcDoc); - if (!ipcDoc) { - return; - } - - IAccessibleHolder proxyHolder; - if (!ipcDoc->SendGetWindowedPluginIAccessible( - reinterpret_cast<uintptr_t>(mHwnd), &proxyHolder)) { - return; - } - - mCOMProxy.reset(proxyHolder.Release()); - return; - } -#endif - // The plugin is not windowless. In this situation we use // use its inner child owned by the plugin so that we don't get // in an infinite loop, where the WM_GETOBJECT's get forwarded @@ -92,14 +73,6 @@ HTMLWin32ObjectAccessible::HTMLWin32ObjectAccessible(void* aHwnd, void HTMLWin32ObjectAccessible::GetNativeInterface(void** aNativeAccessible) { -#if defined(MOZ_CONTENT_SANDBOX) - if (XRE_IsContentProcess()) { - RefPtr<IAccessible> addRefed = mCOMProxy.get(); - addRefed.forget(aNativeAccessible); - return; - } -#endif - if (mHwnd) { ::AccessibleObjectFromWindow(static_cast<HWND>(mHwnd), OBJID_WINDOW, IID_IAccessible, diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h index 786d52191..b473061a2 100644 --- a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h +++ b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h @@ -8,10 +8,6 @@ #include "BaseAccessibles.h" -#if defined(MOZ_CONTENT_SANDBOX) -#include "mozilla/mscom/Ptr.h" -#endif - struct IAccessible; namespace mozilla { @@ -59,9 +55,6 @@ public: protected: void* mHwnd; -#if defined(MOZ_CONTENT_SANDBOX) - mscom::ProxyUniquePtr<IAccessible> mCOMProxy; -#endif }; } // namespace a11y |