From 594cbca6d1209afbed3c9af99522d9e80fd613ab Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 20:34:35 +0000 Subject: Issue #80 - De-unify dom/plugins/ipc --- dom/plugins/ipc/D3D11SurfaceHolder.h | 1 + dom/plugins/ipc/PluginAsyncSurrogate.h | 1 + dom/plugins/ipc/PluginInstanceParent.cpp | 3 +++ dom/plugins/ipc/PluginModuleParent.cpp | 5 +++++ dom/plugins/ipc/PluginQuirks.h | 2 ++ dom/plugins/ipc/PluginUtilsWin.h | 1 + dom/plugins/ipc/hangui/moz.build | 2 +- dom/plugins/ipc/interpose/moz.build | 2 +- dom/plugins/ipc/moz.build | 19 +++++++------------ 9 files changed, 22 insertions(+), 14 deletions(-) (limited to 'dom/plugins') diff --git a/dom/plugins/ipc/D3D11SurfaceHolder.h b/dom/plugins/ipc/D3D11SurfaceHolder.h index 16cd2d182..2d2342347 100644 --- a/dom/plugins/ipc/D3D11SurfaceHolder.h +++ b/dom/plugins/ipc/D3D11SurfaceHolder.h @@ -6,6 +6,7 @@ #define _include_dom_plugins_ipc_D3D11SurfaceHolder_h__ #include "ipc/IPCMessageUtils.h" +#include "mozilla/gfx/2D.h" #include "mozilla/gfx/Point.h" #include "mozilla/gfx/Types.h" diff --git a/dom/plugins/ipc/PluginAsyncSurrogate.h b/dom/plugins/ipc/PluginAsyncSurrogate.h index 5b6315715..8e69a57a4 100644 --- a/dom/plugins/ipc/PluginAsyncSurrogate.h +++ b/dom/plugins/ipc/PluginAsyncSurrogate.h @@ -8,6 +8,7 @@ #define dom_plugins_ipc_PluginAsyncSurrogate_h #include "mozilla/UniquePtr.h" +#include "mozilla/WeakPtr.h" #include "npapi.h" #include "npfunctions.h" #include "npruntime.h" diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp index 24b1410bc..a7d4a6ff5 100644 --- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -9,6 +9,7 @@ #include "mozilla/BasicEvents.h" #include "mozilla/Preferences.h" +#include "D3D11SurfaceHolder.h" #include "PluginInstanceParent.h" #include "BrowserStreamParent.h" #include "PluginAsyncSurrogate.h" @@ -69,8 +70,10 @@ extern const wchar_t* kFlashFullscreenClass; #include #endif // defined(XP_MACOSX) +using namespace mozilla; using namespace mozilla::plugins; using namespace mozilla::layers; +using namespace mozilla::gfx; using namespace mozilla::gl; void diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index 4a509676d..6ea205ef0 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -29,10 +29,14 @@ #include "nsNPAPIPlugin.h" #include "nsPrintfCString.h" #include "prsystem.h" +#include "PluginBackgroundDestroyer.h" #include "PluginQuirks.h" +#include "PluginStreamParent.h" +#include "StreamNotifyParent.h" #include "GeckoProfiler.h" #include "nsPluginTags.h" #include "nsUnicharUtils.h" +#include "mozilla/layers/ImageBridgeChild.h" #include "mozilla/layers/TextureClientRecycleAllocator.h" #ifdef XP_WIN @@ -56,6 +60,7 @@ using mozilla::ipc::MessageChannel; using mozilla::ipc::GeckoChildProcessHost; using namespace mozilla; +using namespace mozilla::layers; using namespace mozilla::plugins; using namespace mozilla::plugins::parent; diff --git a/dom/plugins/ipc/PluginQuirks.h b/dom/plugins/ipc/PluginQuirks.h index f0a6b6a30..66dc8fba6 100644 --- a/dom/plugins/ipc/PluginQuirks.h +++ b/dom/plugins/ipc/PluginQuirks.h @@ -7,6 +7,8 @@ #ifndef dom_plugins_PluginQuirks_h #define dom_plugins_PluginQuirks_h +#include "nsString.h" + namespace mozilla { namespace plugins { diff --git a/dom/plugins/ipc/PluginUtilsWin.h b/dom/plugins/ipc/PluginUtilsWin.h index 097ae5262..a1a7c2aa6 100644 --- a/dom/plugins/ipc/PluginUtilsWin.h +++ b/dom/plugins/ipc/PluginUtilsWin.h @@ -8,6 +8,7 @@ #define dom_plugins_PluginUtilsWin_h 1 #include "npapi.h" +#include "PluginModuleParent.h" namespace mozilla { namespace plugins { diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index 0b84cfb8f..52c2f1495 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -6,7 +6,7 @@ Program('plugin-hang-ui') -UNIFIED_SOURCES += [ +SOURCES += [ 'MiniShmChild.cpp', 'PluginHangUIChild.cpp', ] diff --git a/dom/plugins/ipc/interpose/moz.build b/dom/plugins/ipc/interpose/moz.build index 8bd8ee651..10171afd0 100644 --- a/dom/plugins/ipc/interpose/moz.build +++ b/dom/plugins/ipc/interpose/moz.build @@ -6,7 +6,7 @@ SharedLibrary('plugin_child_interpose') -UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_NAME) ] +SOURCES += [ "%s.mm" % (LIBRARY_NAME) ] OS_LIBS += ['-framework Carbon'] diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 051d5a3b4..182a11562 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -48,13 +48,11 @@ if CONFIG['OS_ARCH'] == 'WINNT': EXPORTS.mozilla.plugins += [ 'PluginSurfaceParent.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ + 'MiniShmParent.cpp', 'PluginHangUIParent.cpp', 'PluginSurfaceParent.cpp', ] - SOURCES += [ - 'MiniShmParent.cpp', # Issues with CreateEvent - ] DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX'] LOCAL_INCLUDES += [ '/widget', @@ -66,15 +64,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'PluginInterposeOSX.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'BrowserStreamChild.cpp', 'BrowserStreamParent.cpp', 'ChildAsyncCall.cpp', 'ChildTimer.cpp', 'PluginAsyncSurrogate.cpp', 'PluginBackgroundDestroyer.cpp', + 'PluginInstanceChild.cpp', 'PluginInstanceParent.cpp', 'PluginMessageUtils.cpp', + 'PluginModuleChild.cpp', 'PluginModuleParent.cpp', 'PluginProcessChild.cpp', 'PluginProcessParent.cpp', @@ -83,23 +83,18 @@ UNIFIED_SOURCES += [ 'PluginScriptableObjectParent.cpp', 'PluginStreamChild.cpp', 'PluginStreamParent.cpp', -] - -SOURCES += [ - 'PluginInstanceChild.cpp', # 'PluginThreadCallback' : ambiguous symbol - 'PluginModuleChild.cpp', # Redefinition of mozilla::WindowsDllInterceptor sUser32Intercept 'PluginWidgetChild.cpp', 'PluginWidgetParent.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'PluginInterposeOSX.mm', 'PluginUtilsOSX.mm', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - UNIFIED_SOURCES += [ + SOURCES += [ 'D3D11SurfaceHolder.cpp', 'PluginUtilsWin.cpp' ] -- cgit v1.2.3