Re-unify most of gfxre-unify

1 files changed, 18 insertions, 14 deletions

diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index be0c95ba20..1449c3477a 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -48,6 +48,8 @@ EXPORTS += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'D3D11ShareHandleImage.cpp',
+    ]
+    UNIFIED_SOURCES += [
         'D3D9SurfaceImage.cpp',
         'IMFYCbCrImage.cpp',
         'TextureDIB.cpp',
@@ -64,7 +66,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         SOURCES += [
             'd3d11/CompositorD3D11.cpp',
             'd3d11/ReadbackManagerD3D11.cpp',
-            'd3d11/TextureD3D11.cpp',
+        ]
+        UNIFIED_SOURCES += [            'd3d11/TextureD3D11.cpp',
         ]
 
 EXPORTS.gfxipc += [
@@ -208,14 +211,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'MacIOSurfaceHelpers.h',
         'MacIOSurfaceImage.h',
     ]
+    UNIFIED_SOURCES += [
+        'opengl/GLManager.cpp',
+    ]
     SOURCES += [
         'ipc/ShadowLayerUtilsMac.cpp',
         'MacIOSurfaceHelpers.cpp',
         'MacIOSurfaceImage.cpp',
-        'opengl/GLManager.cpp',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'apz/public/IAPZCTreeManager.cpp',
     'apz/src/APZCTreeManager.cpp',
     'apz/src/AsyncPanZoomController.cpp',
@@ -250,7 +255,6 @@ SOURCES += [
     'basic/BasicColorLayer.cpp',
     'basic/BasicCompositor.cpp',
     'basic/BasicContainerLayer.cpp',
-    'basic/BasicImageLayer.cpp',
     'basic/BasicImages.cpp',
     'basic/BasicLayerManager.cpp',
     'basic/BasicLayersImpl.cpp',
@@ -299,7 +303,6 @@ SOURCES += [
     'Effects.cpp',
     'FrameMetrics.cpp',
     'GLImages.cpp',
-    'ImageContainer.cpp',
     'ImageDataSerializer.cpp',
     'ImageLayers.cpp',
     'ipc/APZChild.cpp',
@@ -309,7 +312,9 @@ SOURCES += [
     'ipc/CompositableTransactionParent.cpp',
     'ipc/CompositorBench.cpp',
     'ipc/CompositorBridgeChild.cpp',
+    'ipc/CompositorBridgeParent.cpp',
     'ipc/CompositorThread.cpp',
+    'ipc/CrossProcessCompositorBridgeParent.cpp',
     'ipc/ImageBridgeChild.cpp',
     'ipc/ImageBridgeParent.cpp',
     'ipc/ImageContainerChild.cpp',
@@ -327,12 +332,10 @@ SOURCES += [
     'ipc/SharedRGBImage.cpp',
     'ipc/VideoBridgeChild.cpp',
     'ipc/VideoBridgeParent.cpp',
-    'Layers.cpp',
     'LayerScope.cpp',
     'LayersLogging.cpp',
     'LayerSorter.cpp',
     'LayersTypes.cpp',
-    'LayerTreeInvalidation.cpp',
     'opengl/CompositingRenderTargetOGL.cpp',
     'opengl/CompositorOGL.cpp',
     'opengl/GLBlitTextureImageHelper.cpp',
@@ -340,7 +343,6 @@ SOURCES += [
     'opengl/TextureClientOGL.cpp',
     'opengl/TextureHostOGL.cpp',
     'opengl/TexturePoolOGL.cpp',
-    'PersistentBufferProvider.cpp',
     'protobuf/LayerScopePacket.pb.cc',
     'ReadbackProcessor.cpp',
     'RenderTrace.cpp',
@@ -348,11 +350,13 @@ SOURCES += [
     'TextureWrapperImage.cpp',
 ]
 
-# Implementation in CBP.cpp of things used in CPCBP.cpp
-# EraseLayerState, UpdateIndirectTree and map<uint64_t, CompositorBridgeParent::LayerTreeState>
-UNIFIED_SOURCES += [
-    'ipc/CompositorBridgeParent.cpp',
-    'ipc/CrossProcessCompositorBridgeParent.cpp',
+# Cannot be built unified
+SOURCES += [
+    'basic/BasicImageLayer.cpp',
+    'ImageContainer.cpp',
+    'Layers.cpp',
+    'LayerTreeInvalidation.cpp',
+    'PersistentBufferProvider.cpp',
 ]
 
 # Disable RTTI in google protocol buffer
@@ -420,6 +424,6 @@ if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
 
 if CONFIG['MOZ_ENABLE_SKIA']:
-  SOURCES += [
+  UNIFIED_SOURCES += [
     'composite/PaintCounter.cpp',
   ]