From dfa87279f841c2a3cc52bff9681c8bf7ef04fc36 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 13 May 2020 10:10:59 +0000
Subject: Issue #80 - De-unify gfx/2d

---
 gfx/2d/RecordedEvent.cpp |  1 +
 gfx/2d/moz.build         | 19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'gfx')

diff --git a/gfx/2d/RecordedEvent.cpp b/gfx/2d/RecordedEvent.cpp
index 3bfc5c8f6..e6be60b59 100644
--- a/gfx/2d/RecordedEvent.cpp
+++ b/gfx/2d/RecordedEvent.cpp
@@ -7,6 +7,7 @@
 
 #include "PathRecording.h"
 #include "RecordingTypes.h"
+#include "DrawEventRecorder.h"
 #include "Tools.h"
 #include "Filters.h"
 #include "Logging.h"
diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
index ad095503d..c862f413f 100644
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -63,7 +63,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
     EXPORTS.mozilla.gfx += [
         'MacIOSurface.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'NativeFontResourceMac.cpp',
         'PathCG.cpp',
         'ScaledFontMac.cpp',
@@ -95,10 +95,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
-    UNIFIED_SOURCES += [
-        'convolver.cpp',
-    ]
     SOURCES += [
+        'convolver.cpp',
         'DrawTargetSkia.cpp',
         'image_operations.cpp', # Uses _USE_MATH_DEFINES
         'PathSkia.cpp',
@@ -143,11 +141,15 @@ elif CONFIG['CPU_ARCH'].startswith('mips'):
             'convolverLS3.cpp',
         ]
 
+# Won't build non-unified with a build error in iosfwd `strlen` (??)
 UNIFIED_SOURCES += [
-    'BezierUtils.cpp',
-    'Blur.cpp',
     'DataSourceSurface.cpp',
     'DataSurfaceHelpers.cpp',
+]
+
+SOURCES += [
+    'BezierUtils.cpp',
+    'Blur.cpp',
     'DrawEventRecorder.cpp',
     'DrawingJob.cpp',
     'DrawTarget.cpp',
@@ -156,6 +158,7 @@ UNIFIED_SOURCES += [
     'DrawTargetDual.cpp',
     'DrawTargetRecording.cpp',
     'DrawTargetTiled.cpp',
+    'Factory.cpp', # Need to suppress warnings in Skia header files.
     'FilterNodeSoftware.cpp',
     'FilterProcessing.cpp',
     'FilterProcessingScalar.cpp',
@@ -177,10 +180,6 @@ UNIFIED_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']
 
-- 
cgit v1.2.3