summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-14 20:36:39 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-14 20:36:39 +0000
commit2e986f31443ca9164ad96ad596f7bc71ae1574c0 (patch)
tree3d57448eb3a82c535bc374a70a4266111aa67a73 /gfx
parent6ca94dc203ea269d1570ee55813dc77035d50397 (diff)
downloaduxp-2e986f31443ca9164ad96ad596f7bc71ae1574c0.tar.gz
Issue #80 - De-unify gfx/src
Diffstat (limited to 'gfx')
-rw-r--r--gfx/src/gfxTelemetry.cpp1
-rw-r--r--gfx/src/moz.build8
-rw-r--r--gfx/src/nsRegion.cpp1
3 files changed, 4 insertions, 6 deletions
diff --git a/gfx/src/gfxTelemetry.cpp b/gfx/src/gfxTelemetry.cpp
index 9ea15dcbd3..b027cde394 100644
--- a/gfx/src/gfxTelemetry.cpp
+++ b/gfx/src/gfxTelemetry.cpp
@@ -4,6 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "gfxTelemetry.h"
+#include "mozilla/Assertions.h"
namespace mozilla {
namespace gfx {
diff --git a/gfx/src/moz.build b/gfx/src/moz.build
index ea707a340a..b11fada66d 100644
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -56,11 +56,12 @@ if CONFIG['MOZ_X11']:
'X11Util.cpp',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'DriverCrashGuard.cpp',
'FilterSupport.cpp',
'gfxTelemetry.cpp',
'nsColor.cpp',
+ 'nsDeviceContext.cpp',
'nsFont.cpp',
'nsFontMetrics.cpp',
'nsRect.cpp',
@@ -72,11 +73,6 @@ UNIFIED_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/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index 3b0bec1e31..ed86704e89 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -5,6 +5,7 @@
#include "nsRegion.h"
#include "nsTArray.h"
+#include "gfx2DGlue.h"
#include "gfxUtils.h"
#include "mozilla/ToString.h"