Bug 1479456: Fix some non-unified bustage in gfx/thebes. r=jrmuizel

gfx/2d/FontVariation.h

@@ -7,6 +7,8 @@
 #ifndef MOZILLA_GFX_FONTVARIATION_H_
 #define MOZILLA_GFX_FONTVARIATION_H_
 
+#include <stdint.h>
+
 namespace mozilla {
 namespace gfx {
 

gfx/thebes/gfxFont.cpp

@@ -46,6 +46,10 @@
 #include "GreekCasing.h"
 
 #include "cairo.h"
+#ifdef XP_WIN
+#include "cairo-win32.h"
+#include "gfxWindowsPlatform.h"
+#endif
 
 #include "harfbuzz/hb.h"
 #include "harfbuzz/hb-ot.h"

gfx/thebes/gfxFontInfoLoader.cpp

@@ -9,6 +9,10 @@
 #include "nsThreadUtils.h"              // for nsRunnable
 #include "gfxPlatformFontList.h"
 
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
 using namespace mozilla;
 using services::GetObserverService;
 

gfx/thebes/gfxFontMissingGlyphs.h

@@ -7,6 +7,7 @@
 #define GFX_FONTMISSINGGLYPHS_H
 
 #include "mozilla/Attributes.h"
+#include "mozilla/gfx/MatrixFwd.h"
 #include "mozilla/gfx/Rect.h"
 
 namespace mozilla {
@@ -24,6 +25,7 @@ class gfxFontMissingGlyphs final
 {
     typedef mozilla::gfx::DrawTarget DrawTarget;
     typedef mozilla::gfx::Float Float;
+    typedef mozilla::gfx::Matrix Matrix;
     typedef mozilla::gfx::Pattern Pattern;
     typedef mozilla::gfx::Rect Rect;
 

gfx/thebes/gfxPattern.cpp

@@ -182,7 +182,7 @@ gfxPattern::IsOpaque()
 }
 
 void
-gfxPattern::SetSamplingFilter(gfx::SamplingFilter filter)
+gfxPattern::SetSamplingFilter(mozilla::gfx::SamplingFilter filter)
 {
   if (mGfxPattern.GetPattern()->GetType() != PatternType::SURFACE) {
     return;
@@ -195,7 +195,7 @@ SamplingFilter
 gfxPattern::SamplingFilter() const
 {
   if (mGfxPattern.GetPattern()->GetType() != PatternType::SURFACE) {
-    return gfx::SamplingFilter::GOOD;
+    return mozilla::gfx::SamplingFilter::GOOD;
   }
   return static_cast<const SurfacePattern*>(mGfxPattern.GetPattern())->mSamplingFilter;
 }

gfx/thebes/gfxSVGGlyphs.cpp

@@ -40,7 +40,7 @@ using namespace mozilla;
 
 typedef mozilla::dom::Element Element;
 
-/* static */ const Color SimpleTextContextPaint::sZero = Color();
+/* static */ const mozilla::gfx::Color SimpleTextContextPaint::sZero;
 
 gfxSVGGlyphs::gfxSVGGlyphs(hb_blob_t *aSVGTable, gfxFontEntry *aFontEntry)
     : mSVGData(aSVGTable)

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

@@ -6,6 +6,7 @@
 
 #include "gfxTextRun.h"
 #include "gfxGlyphExtents.h"
+#include "gfxHarfBuzzShaper.h"
 #include "gfxPlatformFontList.h"
 #include "gfxUserFontSet.h"
 #include "mozilla/gfx/2D.h"