From 9f37161ec53bb2163ef85d16bcc69a6aa339a044 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 12 May 2020 12:57:04 +0000 Subject: Issue #80 - De-unify gfx/thebes --- gfx/thebes/DeviceManagerDx.cpp | 1 - gfx/thebes/DeviceManagerDx.h | 1 + gfx/thebes/gfxDWriteFontList.cpp | 1 + gfx/thebes/gfxFont.cpp | 5 +++++ gfx/thebes/gfxFontEntry.cpp | 1 + gfx/thebes/gfxFontInfoLoader.cpp | 2 ++ gfx/thebes/gfxHarfBuzzShaper.h | 2 ++ gfx/thebes/gfxMathTable.cpp | 1 + gfx/thebes/gfxMatrix.cpp | 2 ++ gfx/thebes/gfxPattern.cpp | 1 + gfx/thebes/gfxSVGGlyphs.cpp | 1 + gfx/thebes/gfxScriptItemizer.cpp | 2 ++ gfx/thebes/gfxSkipChars.cpp | 1 + gfx/thebes/gfxTextRun.cpp | 2 ++ gfx/thebes/moz.build | 31 ++++++++++--------------------- 15 files changed, 32 insertions(+), 22 deletions(-) diff --git a/gfx/thebes/DeviceManagerDx.cpp b/gfx/thebes/DeviceManagerDx.cpp index 9f42974c3..5f505f88b 100644 --- a/gfx/thebes/DeviceManagerDx.cpp +++ b/gfx/thebes/DeviceManagerDx.cpp @@ -15,7 +15,6 @@ #include "mozilla/gfx/Logging.h" #include "mozilla/layers/CompositorThread.h" #include "nsIGfxInfo.h" -#include #include namespace mozilla { diff --git a/gfx/thebes/DeviceManagerDx.h b/gfx/thebes/DeviceManagerDx.h index e29ab0731..25c028b55 100644 --- a/gfx/thebes/DeviceManagerDx.h +++ b/gfx/thebes/DeviceManagerDx.h @@ -20,6 +20,7 @@ #include #include +#include // This header is available in the June 2010 SDK and in the Win8 SDK #include diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index 5cc1fbb92..12e2d8adc 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -18,6 +18,7 @@ #include "nsDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h" #include "nsISimpleEnumerator.h" +#include "GeckoProfiler.h" #include "gfxGDIFontList.h" diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index 490a866db..16274c801 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/gfx/thebes/gfxFont.cpp @@ -44,6 +44,11 @@ #include "cairo.h" +#ifdef XP_WIN +#include "cairo-win32.h" +#include "gfxWindowsPlatform.h" +#endif + #include "harfbuzz/hb.h" #include "harfbuzz/hb-ot.h" #include "graphite2/Font.h" diff --git a/gfx/thebes/gfxFontEntry.cpp b/gfx/thebes/gfxFontEntry.cpp index f33d6a9d8..695e94e9f 100644 --- a/gfx/thebes/gfxFontEntry.cpp +++ b/gfx/thebes/gfxFontEntry.cpp @@ -19,6 +19,7 @@ #include "gfxTypes.h" #include "gfxContext.h" #include "gfxFontConstants.h" +#include "gfxGraphiteShaper.h" #include "gfxHarfBuzzShaper.h" #include "gfxUserFontSet.h" #include "gfxPlatformFontList.h" diff --git a/gfx/thebes/gfxFontInfoLoader.cpp b/gfx/thebes/gfxFontInfoLoader.cpp index a53c96369..c865f1abe 100644 --- a/gfx/thebes/gfxFontInfoLoader.cpp +++ b/gfx/thebes/gfxFontInfoLoader.cpp @@ -8,6 +8,8 @@ #include "nsIObserverService.h" #include "nsThreadUtils.h" // for nsRunnable #include "gfxPlatformFontList.h" +#include "mozilla/gfx/Logging.h" +#include using namespace mozilla; using services::GetObserverService; diff --git a/gfx/thebes/gfxHarfBuzzShaper.h b/gfx/thebes/gfxHarfBuzzShaper.h index 70d912cc0..b4b61159f 100644 --- a/gfx/thebes/gfxHarfBuzzShaper.h +++ b/gfx/thebes/gfxHarfBuzzShaper.h @@ -12,6 +12,8 @@ #include "nsUnicodeProperties.h" #include "mozilla/gfx/2D.h" +using namespace mozilla; + class gfxHarfBuzzShaper : public gfxFontShaper { public: explicit gfxHarfBuzzShaper(gfxFont *aFont); diff --git a/gfx/thebes/gfxMathTable.cpp b/gfx/thebes/gfxMathTable.cpp index f7047c747..d9f4462ff 100644 --- a/gfx/thebes/gfxMathTable.cpp +++ b/gfx/thebes/gfxMathTable.cpp @@ -8,6 +8,7 @@ #include "harfbuzz/hb-ot.h" #define FixedToFloat(f) ((f) * (1.0 / 65536.0)) +#define FloatToFixed(f) (65536 * (f)) using namespace mozilla; diff --git a/gfx/thebes/gfxMatrix.cpp b/gfx/thebes/gfxMatrix.cpp index 8fcce4ce9..25a4d5a6f 100644 --- a/gfx/thebes/gfxMatrix.cpp +++ b/gfx/thebes/gfxMatrix.cpp @@ -8,6 +8,8 @@ #include "mozilla/gfx/Tools.h" #include "mozilla/gfx/Matrix.h" // for Matrix4x4 +using namespace mozilla::gfx; + #define CAIRO_MATRIX(x) reinterpret_cast((x)) #define CONST_CAIRO_MATRIX(x) reinterpret_cast((x)) diff --git a/gfx/thebes/gfxPattern.cpp b/gfx/thebes/gfxPattern.cpp index d937b992f..3092c8008 100644 --- a/gfx/thebes/gfxPattern.cpp +++ b/gfx/thebes/gfxPattern.cpp @@ -17,6 +17,7 @@ #include +using namespace mozilla; using namespace mozilla::gfx; gfxPattern::gfxPattern(const Color& aColor) diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp index 23f68f590..13c0420cc 100644 --- a/gfx/thebes/gfxSVGGlyphs.cpp +++ b/gfx/thebes/gfxSVGGlyphs.cpp @@ -38,6 +38,7 @@ #define UTF8_CHARSET NS_LITERAL_CSTRING("utf-8") using namespace mozilla; +using namespace mozilla::gfx; typedef mozilla::dom::Element Element; diff --git a/gfx/thebes/gfxScriptItemizer.cpp b/gfx/thebes/gfxScriptItemizer.cpp index b9426ee6f..90e0ca98c 100644 --- a/gfx/thebes/gfxScriptItemizer.cpp +++ b/gfx/thebes/gfxScriptItemizer.cpp @@ -63,6 +63,8 @@ #define TOP() (parenStack[parenSP]) #define SYNC_FIXUP() (fixupCount = 0) +using namespace mozilla::unicode; + void gfxScriptItemizer::push(uint32_t endPairChar, Script newScriptCode) { diff --git a/gfx/thebes/gfxSkipChars.cpp b/gfx/thebes/gfxSkipChars.cpp index d0fad53e2..0cd53c87b 100644 --- a/gfx/thebes/gfxSkipChars.cpp +++ b/gfx/thebes/gfxSkipChars.cpp @@ -5,6 +5,7 @@ #include "gfxSkipChars.h" #include "mozilla/BinarySearch.h" +#include "mozilla/gfx/Logging.h" struct SkippedRangeStartComparator { diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp index 1702cab66..2e2a0d239 100644 --- a/gfx/thebes/gfxTextRun.cpp +++ b/gfx/thebes/gfxTextRun.cpp @@ -37,6 +37,8 @@ #include "cairo.h" +#include + using namespace mozilla; using namespace mozilla::gfx; using namespace mozilla::unicode; diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index e253d7891..b2396bceb 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -148,11 +148,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'PrintTargetWindows.cpp', ] if CONFIG['MOZ_ENABLE_DWRITE_FONT']: - UNIFIED_SOURCES += [ - 'gfxDWriteFontList.cpp', - ] SOURCES += [ 'gfxDWriteCommon.cpp', + 'gfxDWriteFontList.cpp', 'gfxDWriteFonts.cpp', ] @@ -164,27 +162,14 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] SOURCES += [ - 'ContextStateTracker.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', + 'ContextStateTracker.cpp', 'gfxAlphaRecovery.cpp', + 'gfxASurface.cpp', 'gfxBaseSharedMemorySurface.cpp', 'gfxBlur.cpp', 'gfxContext.cpp', + 'gfxDrawable.cpp', 'gfxFont.cpp', 'gfxFontEntry.cpp', 'gfxFontFeatures.cpp', @@ -200,7 +185,9 @@ UNIFIED_SOURCES += [ 'gfxMathTable.cpp', 'gfxMatrix.cpp', 'gfxPattern.cpp', + 'gfxPlatform.cpp', 'gfxPlatformFontList.cpp', + 'gfxPrefs.cpp', 'gfxRect.cpp', 'gfxScriptItemizer.cpp', 'gfxSkipChars.cpp', @@ -209,16 +196,18 @@ UNIFIED_SOURCES += [ 'gfxUserFontSet.cpp', 'gfxUtils.cpp', 'nsUnicodeRange.cpp', + 'PrintTarget.cpp', + 'PrintTargetThebes.cpp', 'SoftwareVsyncSource.cpp', 'VsyncSource.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'gfxMacPlatformFontList.mm', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - UNIFIED_SOURCES += [ + SOURCES += [ 'D3D11Checks.cpp', 'DeviceManagerDx.cpp', ] -- cgit v1.2.3