Re-unify most of gfx

dom/base/moz.build

@@ -222,7 +222,7 @@ EXPORTS.mozilla.dom += [
     'WindowOrientationObserver.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AnonymousContent.cpp',
     'Attr.cpp',
     'BarProps.cpp',
@@ -238,7 +238,6 @@ SOURCES += [
     'DirectionalityUtils.cpp',
     'DocGroup.cpp',
     'DocumentFragment.cpp',
-    'DocumentOrShadowRoot.cpp',
     'DocumentType.cpp',
     'DOMCursor.cpp',
     'DOMError.cpp',
@@ -373,12 +372,14 @@ SOURCES += [
 ]
 
 if CONFIG['MOZ_WEBRTC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsDOMDataChannel.cpp',
     ]
 
 # these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
 SOURCES += [
+    # DocumentOrShadowRoot conflicts with mozilla::dom::ShadowRoot
+    'DocumentOrShadowRoot.cpp',
     # Several conflicts with other bindings.
     'DOMIntersectionObserver.cpp',
     # Because of OS X headers.

dom/canvas/ImageBitmapColorUtils.cpp

@@ -6,9 +6,6 @@
 
 #include "ImageBitmapColorUtils.h"
 
-#include "js/LegacyIntTypes.h"
-#include <cmath>
-
 namespace mozilla {
 namespace dom {
 

dom/canvas/moz.build

@@ -41,7 +41,7 @@ EXPORTS.mozilla.dom += [
 ]
 
 # Canvas 2D and common sources
-SOURCES += [
+UNIFIED_SOURCES += [
     'CanvasImageCache.cpp',
     'CanvasRenderingContext2D.cpp',
     'CanvasRenderingContextHelper.cpp',
@@ -59,7 +59,7 @@ SOURCES += [
 ]
 
 # WebGL Sources
-SOURCES += [
+UNIFIED_SOURCES += [
     'TexUnpackBlob.cpp',
     'WebGL1Context.cpp',
     'WebGL1ContextUniforms.cpp',

dom/fetch/moz.build

@@ -19,14 +19,9 @@ EXPORTS.mozilla.dom += [
 ]
 
 UNIFIED_SOURCES += [
+    'ChannelInfo.cpp',
     'Fetch.cpp',
     'FetchConsumer.cpp',
-    'Request.cpp',
-    'Response.cpp',
-]
-
-SOURCES += [
-    'ChannelInfo.cpp',
     'FetchDriver.cpp',
     'FetchObserver.cpp',
     'FetchUtil.cpp',
@@ -34,6 +29,8 @@ SOURCES += [
     'InternalHeaders.cpp',
     'InternalRequest.cpp',
     'InternalResponse.cpp',
+    'Request.cpp',
+    'Response.cpp',
 ]
 
 IPDL_SOURCES += [

dom/gamepad/moz.build

@@ -30,7 +30,7 @@ if CONFIG['MOZ_GAMEPAD']:
         'ipc/GamepadTestChannelParent.h'
         ]
 
-    SOURCES = [
+    UNIFIED_SOURCES = [
         'Gamepad.cpp',
         'GamepadButton.cpp',
         'GamepadManager.cpp',
@@ -45,19 +45,19 @@ if CONFIG['MOZ_GAMEPAD']:
         ]
 
     if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'fallback/FallbackGamepad.cpp'
         ]
     elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'cocoa/CocoaGamepad.cpp'
         ]
     elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'windows/WindowsGamepad.cpp'
         ]
     elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'linux/LinuxGamepad.cpp'
         ]
 

dom/media/eme/moz.build

@@ -22,7 +22,7 @@ EXPORTS.mozilla += [
     'EMEUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'CDMCaps.cpp',
     'DetailedPromise.cpp',
     'EMEUtils.cpp',

dom/media/encoder/moz.build

@@ -15,7 +15,7 @@ EXPORTS += [
     'TrackMetadataBase.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'MediaEncoder.cpp',
     'OpusTrackEncoder.cpp',
     'TrackEncoder.cpp',
@@ -25,7 +25,7 @@ if CONFIG['MOZ_WEBM_ENCODER']:
     EXPORTS += ['VP8TrackEncoder.h',
     ]
 
-    SOURCES += ['VP8TrackEncoder.cpp',
+    UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
     ]
 
     LOCAL_INCLUDES += ['/media/libyuv/include']

dom/media/gmp/moz.build

@@ -76,7 +76,7 @@ if CONFIG['MOZ_EME']:
         'GMPCDMProxy.h',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'GMPAudioDecoderChild.cpp',
     'GMPAudioDecoderParent.cpp',
     'GMPAudioHost.cpp',
@@ -112,7 +112,7 @@ SOURCES += [
 ]
 
 if CONFIG['MOZ_EME']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'GMPCDMCallbackProxy.cpp',
         'GMPCDMProxy.cpp',
     ]

dom/media/platforms/agnostic/eme/moz.build

@@ -10,7 +10,7 @@ EXPORTS += [
     'SamplesWaitingForKey.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'EMEAudioDecoder.cpp',
     'EMEDecoderModule.cpp',
     'EMEVideoDecoder.cpp',

dom/media/platforms/agnostic/gmp/moz.build

@@ -10,7 +10,7 @@ EXPORTS += [
     'MediaDataDecoderProxy.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'GMPAudioDecoder.cpp',
     'GMPDecoderModule.cpp',
     'GMPVideoDecoder.cpp',

dom/media/platforms/ffmpeg/moz.build

@@ -16,7 +16,7 @@ DIRS += [
     'ffmpeg59',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'FFmpegRuntimeLinker.cpp',
 ]
 

dom/media/webaudio/moz.build

@@ -74,7 +74,7 @@ EXPORTS.mozilla.dom += [
     'WaveShaperNode.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AnalyserNode.cpp',
     'AudioBlock.cpp',
     'AudioBuffer.cpp',

dom/media/webspeech/synth/moz.build

@@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [
     'SpeechSynthesisVoice.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ipc/SpeechSynthesisChild.cpp',
     'ipc/SpeechSynthesisParent.cpp',
     'nsSpeechTask.cpp',

dom/plugins/ipc/hangui/moz.build

@@ -5,7 +5,7 @@
 
 Program('plugin-hang-ui')
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'MiniShmChild.cpp',
     'PluginHangUIChild.cpp',
 ]

dom/plugins/ipc/interpose/moz.build

@@ -5,7 +5,7 @@
 
 SharedLibrary('plugin_child_interpose')
 
-SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
+UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
 
 OS_LIBS += ['-framework Carbon']
 

dom/xul/moz.build

@@ -17,7 +17,7 @@ EXPORTS += [
     'nsIXULDocument.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsXULCommandDispatcher.cpp',
     'nsXULContentSink.cpp',
     'nsXULElement.cpp',

gfx/2d/moz.build

@@ -62,7 +62,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
     EXPORTS.mozilla.gfx += [
         'MacIOSurface.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'NativeFontResourceMac.cpp',
         'PathCG.cpp',
         'ScaledFontMac.cpp',
@@ -94,8 +94,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'convolver.cpp',
+    ]
+    SOURCES += [
         'DrawTargetSkia.cpp',
         'image_operations.cpp', # Uses _USE_MATH_DEFINES
         'PathSkia.cpp',
@@ -140,7 +142,7 @@ elif CONFIG['CPU_ARCH'].startswith('mips'):
             'convolverLS3.cpp',
         ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BezierUtils.cpp',
     'Blur.cpp',
     'DataSourceSurface.cpp',
@@ -153,7 +155,6 @@ SOURCES += [
     'DrawTargetDual.cpp',
     'DrawTargetRecording.cpp',
     'DrawTargetTiled.cpp',
-    'Factory.cpp', # Need to suppress warnings in Skia header files.
     'FilterNodeSoftware.cpp',
     'FilterProcessing.cpp',
     'FilterProcessingScalar.cpp',
@@ -175,6 +176,10 @@ SOURCES += [
     'SourceSurfaceRawData.cpp',
 ]
 
+SOURCES += [
+    'Factory.cpp', # Need to suppress warnings in Skia header files.
+]
+
 if CONFIG['CLANG_CXX']:
     SOURCES['Factory.cpp'].flags += ['-Wno-implicit-fallthrough']
 

gfx/cairo/cairo/src/moz.build

@@ -106,7 +106,7 @@ SOURCES += [
     'cairo-surface-wrapper.c', #  redefinition of '_copy_transformed_pattern'
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',

gfx/config/moz.build

@@ -14,7 +14,7 @@ EXPORTS.mozilla.gfx += [
   'gfxVars.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
   'gfxConfig.cpp',
   'gfxFeature.cpp',
   'gfxVars.cpp',

gfx/gl/moz.build

@@ -64,7 +64,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'SharedSurfaceD3D11Interop.h',
         'WGLLibrary.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'GLContextProviderWGL.cpp',
         'SharedSurfaceANGLE.cpp',
         'SharedSurfaceD3D11Interop.cpp',
@@ -114,7 +114,7 @@ elif gl_provider == 'GLX':
         'SharedSurfaceGLX.h'
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'DecomposeIntoNoRepeatTriangles.cpp',
     'EGLUtils.cpp',
     'GfxTexturesReporter.cpp',

gfx/layers/apz/public/IAPZCTreeManager.cpp

@@ -9,21 +9,11 @@
 #include "InputData.h"                      // for InputData, etc
 #include "mozilla/EventStateManager.h"      // for WheelPrefs
 #include "mozilla/layers/APZThreadUtils.h"  // for AssertOnCompositorThread, etc
-#include "mozilla/MouseEvents.h"            // for WidgetMouseEvent
 #include "mozilla/TouchEvents.h"            // for WidgetTouchEvent
 
 namespace mozilla {
 namespace layers {
 
-static bool
-WillHandleMouseEvent(const WidgetMouseEventBase& aEvent)
-{
-  return aEvent.mMessage == eMouseMove ||
-         aEvent.mMessage == eMouseDown ||
-         aEvent.mMessage == eMouseUp ||
-         aEvent.mMessage == eDragEnd;
-}
-
 // Returns whether or not a wheel event action will be (or was) performed by
 // APZ. If this returns true, the event must not perform a synchronous
 // scroll.

gfx/layers/apz/public/IAPZCTreeManager.h

@@ -11,6 +11,7 @@
 #include "FrameMetrics.h"               // for FrameMetrics, etc
 #include "mozilla/EventForwards.h"      // for WidgetInputEvent, nsEventStatus
 #include "mozilla/layers/APZUtils.h"    // for HitTestResult
+#include "mozilla/MouseEvents.h"        // for WidgetMouseEvent 
 #include "nsTArrayForwardDeclare.h"     // for nsTArray, nsTArray_Impl, etc
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "Units.h"                      // for CSSPoint, CSSRect, etc
@@ -38,6 +39,15 @@ enum ZoomToRectBehavior : uint32_t {
 
 class AsyncDragMetrics;
 
+static bool
+WillHandleMouseEvent(const WidgetMouseEventBase& aEvent)
+{
+  return aEvent.mMessage == eMouseMove ||
+         aEvent.mMessage == eMouseDown ||
+         aEvent.mMessage == eMouseUp ||
+         aEvent.mMessage == eDragEnd;
+}
+
 class IAPZCTreeManager {
   NS_INLINE_DECL_THREADSAFE_VIRTUAL_REFCOUNTING(IAPZCTreeManager)
 

gfx/layers/apz/src/APZCTreeManager.cpp

@@ -85,21 +85,6 @@ struct APZCTreeManager::TreeBuildingState {
   std::map<ScrollableLayerGuid, AsyncPanZoomController*> mApzcMap;
 };
 
-// Returns whether or not a wheel event action will be (or was) performed by
-// APZ. If this returns true, the event must not perform a synchronous
-// scroll.
-//
-// Even if this returns false, all wheel events in APZ-aware widgets must
-// be sent through APZ so they are transformed correctly for TabParent.
-static bool
-WillHandleWheelEvent(WidgetWheelEvent* aEvent)
-{
-  return EventStateManager::WheelEventIsScrollAction(aEvent) &&
-         (aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_LINE ||
-          aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL ||
-          aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PAGE);
-}
-
 class APZCTreeManager::CheckerboardFlushObserver : public nsIObserver {
 public:
   NS_DECL_ISUPPORTS

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',
   ]

gfx/thebes/moz.build

@@ -121,9 +121,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'PrintTargetPDF.h',
         'PrintTargetWindows.h',
     ]
+    UNIFIED_SOURCES += [
+        'gfxDWriteFontList.cpp',
+    ]    
     SOURCES += [
         'gfxDWriteCommon.cpp',
-        'gfxDWriteFontList.cpp',
         'gfxDWriteFonts.cpp',
         'gfxGDIFont.cpp',
         'gfxGDIFontList.cpp',
@@ -142,14 +144,27 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 
 SOURCES += [
-    'CJKCompatSVS.cpp',
     'ContextStateTracker.cpp',
-    'gfxAlphaRecovery.cpp',
+    # Includes mac system header conflicting with point/size,
+    # and includes glxXlibSurface.h which drags in Xrender.h
     'gfxASurface.cpp',
+    # on X11, gfxDrawable.cpp includes X headers for an old workaround which
+    # we could consider removing soon (affects Ubuntus older than 10.04 LTS)
+    # which currently prevent it from joining UNIFIED_SOURCES.
+    'gfxDrawable.cpp',
+    # gfxPlatform.cpp includes mac system header conflicting with point/size
+    'gfxPlatform.cpp',
+    'gfxPrefs.cpp',
+    'PrintTarget.cpp',
+    'PrintTargetThebes.cpp',
+]
+
+UNIFIED_SOURCES += [
+    'CJKCompatSVS.cpp',
+    'gfxAlphaRecovery.cpp',
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxContext.cpp',
-    'gfxDrawable.cpp',
     'gfxFont.cpp',
     'gfxFontEntry.cpp',
     'gfxFontFeatures.cpp',
@@ -165,9 +180,7 @@ SOURCES += [
     'gfxMathTable.cpp',
     'gfxMatrix.cpp',
     'gfxPattern.cpp',
-    'gfxPlatform.cpp',
     'gfxPlatformFontList.cpp',
-    'gfxPrefs.cpp',
     'gfxRect.cpp',
     'gfxScriptItemizer.cpp',
     'gfxSkipChars.cpp',
@@ -176,18 +189,16 @@ SOURCES += [
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsUnicodeRange.cpp',
-    'PrintTarget.cpp',
-    'PrintTargetThebes.cpp',
     'SoftwareVsyncSource.cpp',
     'VsyncSource.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'D3D11Checks.cpp',
         'DeviceManagerDx.cpp',
     ]

layout/base/moz.build

@@ -118,7 +118,7 @@ EXPORTS.mozilla += [
     'StaticPresData.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AccessibleCaret.cpp',
     'AccessibleCaretEventHub.cpp',
     'AccessibleCaretManager.cpp',
@@ -150,11 +150,9 @@ SOURCES += [
     'nsLayoutDebugger.cpp',
     'nsLayoutHistoryState.cpp',
     'nsLayoutUtils.cpp',
-    'nsPresArena.cpp',
     'nsPresContext.cpp',
     'nsPresShell.cpp',
     'nsQuoteList.cpp',
-    'nsRefreshDriver.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
     'PaintTracker.cpp',
@@ -170,6 +168,13 @@ SOURCES += [
     'ZoomConstraintsClient.cpp',
 ]
 
+# nsPresArena.cpp needs to be built separately because it uses plarena.h.
+# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
+SOURCES += [
+    'nsPresArena.cpp',
+    'nsRefreshDriver.cpp',
+]
+
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['gtest']
 

layout/generic/moz.build

@@ -123,7 +123,7 @@ EXPORTS.mozilla.layout += [
     'FrameChildList.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AsyncScrollBase.cpp',
     'BlockReflowInput.cpp',
     'CSSAlignUtils.cpp',
@@ -157,11 +157,9 @@ SOURCES += [
     'nsIntervalSet.cpp',
     'nsLeafFrame.cpp',
     'nsLineBox.cpp',
-    'nsLineLayout.cpp',
     'nsPageContentFrame.cpp',
     'nsPageFrame.cpp',
     'nsPlaceholderFrame.cpp',
-    'nsPluginFrame.cpp',
     'nsRubyBaseContainerFrame.cpp',
     'nsRubyBaseFrame.cpp',
     'nsRubyContentFrame.cpp',
@@ -187,6 +185,13 @@ SOURCES += [
     'TextOverflow.cpp',
 ]
 
+# nsLineLayout.cpp needs to be built separately because it uses plarena.h.
+# nsPluginFrame.cpp needs to be built separately because of name clashes in the OS X headers.
+SOURCES += [
+    'nsLineLayout.cpp',
+    'nsPluginFrame.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

layout/printing/moz.build

@@ -17,7 +17,7 @@ EXPORTS.mozilla.layout += [
 
 XPIDL_MODULE = 'layout_printing'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ipc/RemotePrintJobChild.cpp',
     'ipc/RemotePrintJobParent.cpp',
     'nsPagePrintTimer.cpp',

layout/style/moz.build

@@ -138,7 +138,7 @@ EXPORTS.mozilla.css += [
     'StyleRule.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AnimationCollection.cpp',
     'AnimationCommon.cpp',
     'CounterStyleManager.cpp',
@@ -169,7 +169,6 @@ SOURCES += [
     'nsCSSProps.cpp',
     'nsCSSPseudoClasses.cpp',
     'nsCSSPseudoElements.cpp',
-    'nsCSSRuleProcessor.cpp',
     'nsCSSRules.cpp',
     'nsCSSScanner.cpp',
     'nsCSSValue.cpp',
@@ -182,7 +181,6 @@ SOURCES += [
     'nsFontFaceUtils.cpp',
     'nsHTMLCSSStyleSheet.cpp',
     'nsHTMLStyleSheet.cpp',
-    'nsLayoutStylesheetCache.cpp',
     'nsMediaFeatures.cpp',
     'nsNthIndexCache.cpp',
     'nsROCSSPrimitiveValue.cpp',
@@ -208,6 +206,14 @@ SOURCES += [
     'SVGAttrAnimationRuleProcessor.cpp',
 ]
 
+# nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
+# nsLayoutStylesheetCache.cpp needs to be built separately because it uses
+# nsExceptionHandler.h, which includes windows.h.
+SOURCES += [
+    'nsCSSRuleProcessor.cpp',
+    'nsLayoutStylesheetCache.cpp',
+]
+
 EXTRA_COMPONENTS += [
     'CSSUnprefixingService.js',
     'CSSUnprefixingService.manifest',

layout/svg/moz.build

@@ -20,7 +20,7 @@ EXPORTS.mozilla += [
     'SVGContextPaint.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsCSSClipPathInstance.cpp',
     'nsCSSFilterInstance.cpp',
     'nsFilterInstance.cpp',

layout/tables/moz.build

@@ -12,7 +12,7 @@ EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
     'nsCellMap.cpp',

layout/xul/grid/moz.build

@@ -18,7 +18,7 @@ EXPORTS += [
     'nsIGridPart.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsGrid.cpp',
     'nsGridCell.cpp',
     'nsGridLayout2.cpp',

layout/xul/moz.build

@@ -37,7 +37,7 @@ EXPORTS.mozilla.dom += [
     'ScrollBoxObject.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BoxObject.cpp',
     'ContainerBoxObject.cpp',
     'ListBoxObject.cpp',

layout/xul/tree/moz.build

@@ -26,7 +26,7 @@ EXPORTS.mozilla.dom += [
     'TreeBoxObject.h'
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsTreeBodyFrame.cpp',
     'nsTreeColFrame.cpp',
     'nsTreeColumns.cpp',