diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2021-03-30 02:27:37 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2021-03-30 02:27:37 -0700 |
| commit | c457666d6d5d478bbe3ca5ff09ae07e061b0ff00 (patch) | |
| tree | f3273a3ade3841a2f5256a25edb09009fe0ae0e5 /gfx/2d | |
| parent | a0c9e3200470c86563d6eff47156eff24bfd1491 (diff) | |
| download | UXP-c457666d6d5d478bbe3ca5ff09ae07e061b0ff00.tar UXP-c457666d6d5d478bbe3ca5ff09ae07e061b0ff00.tar.gz UXP-c457666d6d5d478bbe3ca5ff09ae07e061b0ff00.tar.lz UXP-c457666d6d5d478bbe3ca5ff09ae07e061b0ff00.tar.xz UXP-c457666d6d5d478bbe3ca5ff09ae07e061b0ff00.zip | |
De-unify gfx
Diffstat (limited to 'gfx/2d')
| -rw-r--r-- | gfx/2d/DataSurfaceHelpers.cpp | 2 | ||||
| -rw-r--r-- | gfx/2d/NativeFontResourceMac.cpp | 1 | ||||
| -rw-r--r-- | gfx/2d/RecordedEvent.cpp | 1 | ||||
| -rw-r--r-- | gfx/2d/moz.build | 13 |
4 files changed, 7 insertions, 10 deletions
diff --git a/gfx/2d/DataSurfaceHelpers.cpp b/gfx/2d/DataSurfaceHelpers.cpp index 87ef00fcd..99dfe063a 100644 --- a/gfx/2d/DataSurfaceHelpers.cpp +++ b/gfx/2d/DataSurfaceHelpers.cpp @@ -3,7 +3,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 <cstring> +#include <string.h> #include "2D.h" #include "DataSurfaceHelpers.h" diff --git a/gfx/2d/NativeFontResourceMac.cpp b/gfx/2d/NativeFontResourceMac.cpp index aaf6db181..61fd3b607 100644 --- a/gfx/2d/NativeFontResourceMac.cpp +++ b/gfx/2d/NativeFontResourceMac.cpp @@ -8,6 +8,7 @@ #include "Types.h" #include "mozilla/RefPtr.h" +#include "mozilla/gfx/Logging.h" #ifdef MOZ_WIDGET_UIKIT #include <CoreFoundation/CoreFoundation.h> 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..33b49038f 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,7 +141,7 @@ elif CONFIG['CPU_ARCH'].startswith('mips'): 'convolverLS3.cpp', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'BezierUtils.cpp', 'Blur.cpp', 'DataSourceSurface.cpp', @@ -156,6 +154,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 +176,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'] |