Issue #80 - De-unify gfx/ipc

10 files changed, 23 insertions, 2 deletions

diff --git a/gfx/ipc/GPUChild.cpp b/gfx/ipc/GPUChild.cpp
index ba6053f43..cc2740a84 100644
--- a/gfx/ipc/GPUChild.cpp
+++ b/gfx/ipc/GPUChild.cpp
@@ -10,6 +10,7 @@
 #include "GPUProcessManager.h"
 #include "mozilla/dom/CheckerboardReportService.h"
 #include "mozilla/gfx/gfxVars.h"
+#include "mozilla/Services.h"
 #if defined(XP_WIN)
 # include "mozilla/gfx/DeviceManagerDx.h"
 #endif
diff --git a/gfx/ipc/GPUProcessHost.cpp b/gfx/ipc/GPUProcessHost.cpp
index 613f353a4..71d8144cc 100644
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GPUProcessHost.h"
+#include "GPUChild.h"
 #include "chrome/common/process_watcher.h"
 #include "gfxPrefs.h"
 #include "mozilla/gfx/Logging.h"
diff --git a/gfx/ipc/GPUProcessManager.cpp b/gfx/ipc/GPUProcessManager.cpp
index 8aaf0f1d0..3155e41e9 100644
--- a/gfx/ipc/GPUProcessManager.cpp
+++ b/gfx/ipc/GPUProcessManager.cpp
@@ -6,6 +6,7 @@
 #include "GPUProcessManager.h"
 #include "GPUProcessHost.h"
 #include "GPUProcessListener.h"
+#include "GPUChild.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/layers/APZCTreeManager.h"
@@ -20,6 +21,7 @@
 #ifdef MOZ_WIDGET_SUPPORTS_OOP_COMPOSITING
 # include "mozilla/widget/CompositorWidgetChild.h"
 #endif
+#include "gfxConfig.h"
 #include "nsBaseWidget.h"
 #include "nsContentUtils.h"
 #include "VsyncBridgeChild.h"
@@ -29,6 +31,9 @@
 #include "mozilla/dom/VideoDecoderManagerParent.h"
 #include "MediaPrefs.h"
 
+using namespace mozilla::ipc;
+using namespace mozilla::widget;
+
 namespace mozilla {
 namespace gfx {
 
diff --git a/gfx/ipc/InProcessCompositorSession.cpp b/gfx/ipc/InProcessCompositorSession.cpp
index fd8525085..2090a3404 100644
--- a/gfx/ipc/InProcessCompositorSession.cpp
+++ b/gfx/ipc/InProcessCompositorSession.cpp
@@ -6,10 +6,16 @@
 
 #include "InProcessCompositorSession.h"
 
+#include "mozilla/widget/CompositorWidget.h"
+#include "mozilla/layers/CompositorBridgeParent.h"
+#include "mozilla/layers/CompositorBridgeChild.h"
 // so we can cast an APZCTreeManager to an IAPZCTreeManager
 #include "mozilla/layers/APZCTreeManager.h"
 #include "mozilla/layers/IAPZCTreeManager.h"
 
+using namespace mozilla::layers;
+using namespace mozilla::widget;
+
 namespace mozilla {
 namespace layers {
 
diff --git a/gfx/ipc/InProcessCompositorSession.h b/gfx/ipc/InProcessCompositorSession.h
index deb642da2..c6c89efdd 100644
--- a/gfx/ipc/InProcessCompositorSession.h
+++ b/gfx/ipc/InProcessCompositorSession.h
@@ -7,6 +7,7 @@
 #define _include_mozilla_gfx_ipc_InProcessCompositorSession_h_
 
 #include "CompositorSession.h"
+#include "Layers.h"
 #include "mozilla/gfx/Point.h"
 #include "Units.h"
 
diff --git a/gfx/ipc/RemoteCompositorSession.cpp b/gfx/ipc/RemoteCompositorSession.cpp
index 6e5ad975a..8acf7dea5 100644
--- a/gfx/ipc/RemoteCompositorSession.cpp
+++ b/gfx/ipc/RemoteCompositorSession.cpp
@@ -8,8 +8,10 @@
 #include "mozilla/VsyncDispatcher.h"
 #include "mozilla/layers/APZChild.h"
 #include "mozilla/layers/APZCTreeManagerChild.h"
+#include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/Unused.h"
 #include "nsBaseWidget.h"
+#include "GPUProcessManager.h"
 
 namespace mozilla {
 namespace layers {
diff --git a/gfx/ipc/RemoteCompositorSession.h b/gfx/ipc/RemoteCompositorSession.h
index b4731c5c2..0a7383e29 100644
--- a/gfx/ipc/RemoteCompositorSession.h
+++ b/gfx/ipc/RemoteCompositorSession.h
@@ -9,6 +9,7 @@
 #include "CompositorSession.h"
 #include "mozilla/gfx/Point.h"
 #include "Units.h"
+#include "nsBaseWidget.h"
 
 namespace mozilla {
 namespace layers {
diff --git a/gfx/ipc/VsyncBridgeChild.cpp b/gfx/ipc/VsyncBridgeChild.cpp
index a4be827ef..8a49e43c1 100644
--- a/gfx/ipc/VsyncBridgeChild.cpp
+++ b/gfx/ipc/VsyncBridgeChild.cpp
@@ -6,6 +6,7 @@
 #include "VsyncBridgeChild.h"
 #include "VsyncIOThreadHolder.h"
 #include "mozilla/dom/ContentChild.h"
+#include "GPUProcessManager.h"
 
 namespace mozilla {
 namespace gfx {
diff --git a/gfx/ipc/VsyncBridgeParent.cpp b/gfx/ipc/VsyncBridgeParent.cpp
index 96ef5de0f..7f73967ce 100644
--- a/gfx/ipc/VsyncBridgeParent.cpp
+++ b/gfx/ipc/VsyncBridgeParent.cpp
@@ -5,6 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "VsyncBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
+#include "mozilla/layers/CompositorBridgeParent.h"
+
+using namespace mozilla::layers;
 
 namespace mozilla {
 namespace gfx {
diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index 309681444..ea31f48c5 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -37,12 +37,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'SharedDIBSurface.h',
         'SharedDIBWin.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CompositorSession.cpp',
     'CompositorWidgetVsyncObserver.cpp',
     'D3DMessageUtils.cpp',