Issue #80 - De-unify gfx/thebes

gfx/thebes/DeviceManagerDx.cpp

@@ -15,7 +15,6 @@
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "nsIGfxInfo.h"
-#include <d3d11.h>
 #include <ddraw.h>
 
 namespace mozilla {

gfx/thebes/DeviceManagerDx.h

@@ -20,6 +20,7 @@
 #include <objbase.h>
 
 #include <dxgi.h>
+#include <d3d11.h>
 
 // This header is available in the June 2010 SDK and in the Win8 SDK
 #include <d3dcommon.h>

gfx/thebes/gfxDWriteFontList.cpp

@@ -18,6 +18,7 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsISimpleEnumerator.h"
+#include "GeckoProfiler.h"
 
 #include "gfxGDIFontList.h"
 

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"

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"

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 <d3d11.h>
 
 using namespace mozilla;
 using services::GetObserverService;

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);

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;
 

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<cairo_matrix_t*>((x))
 #define CONST_CAIRO_MATRIX(x) reinterpret_cast<const cairo_matrix_t*>((x))
 

gfx/thebes/gfxPattern.cpp

@@ -17,6 +17,7 @@
 
 #include <vector>
 
+using namespace mozilla;
 using namespace mozilla::gfx;
 
 gfxPattern::gfxPattern(const Color& aColor)

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;
 

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)
 {

gfx/thebes/gfxSkipChars.cpp

@@ -5,6 +5,7 @@
 
 #include "gfxSkipChars.h"
 #include "mozilla/BinarySearch.h"
+#include "mozilla/gfx/Logging.h"
 
 struct SkippedRangeStartComparator
 {

gfx/thebes/gfxTextRun.cpp

@@ -37,6 +37,8 @@
 
 #include "cairo.h"
 
+#include <unicode/unorm2.h>
+
 using namespace mozilla;
 using namespace mozilla::gfx;
 using namespace mozilla::unicode;

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',
     ]