summaryrefslogtreecommitdiffstats
path: root/accessible/windows/msaa
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-02 21:58:04 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-02 21:58:04 +0200
commit755e1020782fb42863e97d58a3e44d2eca760bb0 (patch)
treea632ffe4c847b06e4109069b48f8081415e55772 /accessible/windows/msaa
parent04c8f8f8bc2d2dccb6675bd1ed9912f098e76739 (diff)
downloadUXP-755e1020782fb42863e97d58a3e44d2eca760bb0.tar
UXP-755e1020782fb42863e97d58a3e44d2eca760bb0.tar.gz
UXP-755e1020782fb42863e97d58a3e44d2eca760bb0.tar.lz
UXP-755e1020782fb42863e97d58a3e44d2eca760bb0.tar.xz
UXP-755e1020782fb42863e97d58a3e44d2eca760bb0.zip
Remove content process sandbox code.
Diffstat (limited to 'accessible/windows/msaa')
-rw-r--r--accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp27
-rw-r--r--accessible/windows/msaa/HTMLWin32ObjectAccessible.h7
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