Re-unify most of gfxre-unify

1 files changed, 21 insertions, 10 deletions

diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 1d3cf3bc93..2d4dc41a40 100644
--- a/gfx/thebes/moz.build
+++ b/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',
     ]