Merge branch 're-unify'

8 files changed, 33 insertions, 26 deletions

diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index ecf396e2b0..2e517449a1 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -12,16 +12,16 @@ EXPORTS.graphite2 += [
 ]
 
 if CONFIG['GNU_CC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'direct_machine.cpp'
     ]
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'call_machine.cpp'
     ]
 
 # This should contain all of the _SOURCES from files.mk, except *_machine.cpp
-SOURCES += [
+UNIFIED_SOURCES += [
     'CachedFace.cpp',
     'CmapCache.cpp',
     'Code.cpp',
diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
index 00abf656c0..92dbedb016 100644
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -25,32 +25,35 @@ EXPORTS.harfbuzz += [
 ]
 
 SOURCES += [
-    'hb-blob.cc',
+    'hb-blob.cc', # error: use of undeclared identifier 'snprintf' (FreeBSD)
+    'hb-common.cc', # error: use of undeclared identifier 'strdup'
+    'hb-ot-math.cc', # conflict with hb-ot-layout.cc
+    'hb-ot-shape-complex-hangul.cc', # error: redefinition of enumerator 'NONE'
+    'hb-ot-shape-complex-indic.cc', # error: redefinition of enumerator 'INIT'
+    'hb-ot-shape-complex-use.cc', # error: redefinition of 'basic_features'
+    'hb-ot-shape.cc', # error: functions that differ only in their return type cannot be overloaded
+    'hb-shape-plan.cc', # error: redefinition of 'hb_ot_shaper_face_data_ensure'
+]
+
+UNIFIED_SOURCES += [
     'hb-buffer.cc',
-    'hb-common.cc',
     'hb-face.cc',
     'hb-fallback-shape.cc',
     'hb-font.cc',
     'hb-ot-layout.cc',
     'hb-ot-map.cc',
-    'hb-ot-math.cc',
     'hb-ot-shape-complex-arabic.cc',
     'hb-ot-shape-complex-default.cc',
-    'hb-ot-shape-complex-hangul.cc',
     'hb-ot-shape-complex-hebrew.cc',
     'hb-ot-shape-complex-indic-table.cc',
-    'hb-ot-shape-complex-indic.cc',
     'hb-ot-shape-complex-myanmar.cc',
     'hb-ot-shape-complex-thai.cc',
     'hb-ot-shape-complex-tibetan.cc',
     'hb-ot-shape-complex-use-table.cc',
-    'hb-ot-shape-complex-use.cc',
     'hb-ot-shape-fallback.cc',
     'hb-ot-shape-normalize.cc',
-    'hb-ot-shape.cc',
     'hb-ot-tag.cc',
     'hb-set.cc',
-    'hb-shape-plan.cc',
     'hb-shape.cc',
     'hb-shaper.cc',
     'hb-unicode.cc',
diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index 312fabcf66..43cdff703f 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -36,12 +36,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'SharedDIBSurface.h',
         'SharedDIBWin.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'CompositorSession.cpp',
     'CompositorWidgetVsyncObserver.cpp',
     'D3DMessageUtils.cpp',
diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
index 909a2092e8..b5c7ceca9e 100644
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -8,7 +8,7 @@ EXPORTS += [
     '../include/ots-memory-stream.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'avar.cc',
     'cff.cc',
     'cff_charstring.cc',
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index a15fd40861..33594bd32c 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -75,7 +75,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/fonts/SkFontMgr_indirect.cpp',
         'skia/src/fonts/SkRemotableFontMgr.cpp',
     ]
@@ -407,7 +407,7 @@ def write_sources(f, values, indent):
     else:
       sources['unified'].add(item)
 
-  write_list(f, "SOURCES", sources['unified'], indent)
+  write_list(f, "UNIFIED_SOURCES", sources['unified'], indent)
   write_list(f, "SOURCES", sources['nonunified'], indent)
   
 def write_list(f, name, values, indent):
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 75a66dd28e..61d8c8570d 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -22,7 +22,7 @@ if CONFIG['MOZ_OPTIMIZE']:
     elif CONFIG['GNU_CC']:
         skia_opt_flags += ['-O2']
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'skia/src/core/SkAAClip.cpp',
     'skia/src/core/SkAlphaRuns.cpp',
     'skia/src/core/SkAnnotation.cpp',
@@ -308,7 +308,7 @@ SOURCES['skia/src/core/SkSpriteBlitter4f.cpp'].flags += skia_opt_flags
 SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags
 SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags
 if CONFIG['MOZ_ENABLE_SKIA_PDF']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/core/SkMD5.cpp',
         'skia/src/pdf/SkDeflate.cpp',
         'skia/src/pdf/SkJpegInfo.cpp',
@@ -332,7 +332,7 @@ if CONFIG['MOZ_ENABLE_SKIA_PDF']:
         'skia/src/pdf/SkPDFFont.cpp',
     ]
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
         'skia/src/gpu/batches/GrAnalyticRectBatch.cpp',
         'skia/src/gpu/batches/GrAtlasTextBatch.cpp',
@@ -517,7 +517,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'skia/src/image/SkImage_Gpu.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
         'skia/src/ports/SkOSLibrary_posix.cpp',
@@ -530,7 +530,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
         'skia/src/ports/SkFontHost_mac.cpp',
     ]
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
         'skia/src/ports/SkOSLibrary_posix.cpp',
@@ -562,7 +562,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'skia/src/utils/win/SkIStream.cpp',
     ]
 if CONFIG['INTEL_ARCHITECTURE']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/opts/opts_check_x86.cpp',
     ]
     SOURCES += [
@@ -586,7 +586,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
 elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'skia/src/core/SkUtilsArm.cpp',
     ]
     SOURCES += [
diff --git a/gfx/src/moz.build b/gfx/src/moz.build
index 993d4bde2c..2029a10a10 100644
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -55,12 +55,11 @@ if CONFIG['MOZ_X11']:
         'X11Util.cpp',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'DriverCrashGuard.cpp',
     'FilterSupport.cpp',
     'gfxTelemetry.cpp',
     'nsColor.cpp',
-    'nsDeviceContext.cpp',
     'nsFont.cpp',
     'nsFontMetrics.cpp',
     'nsRect.cpp',
@@ -72,6 +71,11 @@ SOURCES += [
     'TiledRegion.cpp',
 ]
 
+# nsDeviceContext.cpp cannot be built in unified mode because it pulls in OS X system headers.
+SOURCES += [
+    'nsDeviceContext.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index 7e04c96ed1..0c8eb7b83c 100644
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -7,7 +7,7 @@ EXPORTS += [
     'YCbCrUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'scale_yuv_argb.cpp',
     'ycbcr_to_rgb565.cpp',
     'YCbCrUtils.cpp',