Bug 891709 - Fix build bustage in gfx/2d/Factory.cpp when Skia is disabled. r=gw280
authorzhoubcfan <zhoubcfan@163.com>
Sat, 03 May 2014 04:13:00 -0400
changeset 190160 6b8539a2bf06b10048696635a49d0dad13353020
parent 190159 c70a41a3fc2b7a2bc6a71a320354cea4e92fbb37
child 190161 80e4d6b3723a78be0319397e8d9f676a3dec1bc4
push id7411
push userkwierso@gmail.com
push dateTue, 24 Jun 2014 02:07:45 +0000
treeherderfx-team@cc4602e0c1d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgw280
bugs891709
milestone33.0a1
Bug 891709 - Fix build bustage in gfx/2d/Factory.cpp when Skia is disabled. r=gw280
gfx/2d/Factory.cpp
gfx/2d/moz.build
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -14,17 +14,17 @@
 #include "DrawTargetSkia.h"
 #include "ScaledFontBase.h"
 #ifdef MOZ_ENABLE_FREETYPE
 #define USE_SKIA_FREETYPE
 #include "ScaledFontCairo.h"
 #endif
 #endif
 
-#if defined(WIN32) && defined(USE_SKIA)
+#if defined(WIN32)
 #include "ScaledFontWin.h"
 #endif
 
 #ifdef XP_MACOSX
 #include "ScaledFontMac.h"
 #endif
 
 
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -45,33 +45,30 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
         'ScaledFontMac.cpp',
         'SourceSurfaceCG.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'DrawTargetD2D.cpp',
         'PathD2D.cpp',
         'ScaledFontDWrite.cpp',
+        'ScaledFontWin.cpp',
         'SourceSurfaceD2D.cpp',
         'SourceSurfaceD2DTarget.cpp',
     ]
     DEFINES['WIN32'] = True
     # For Direct2D 1.1 we require WINSDK_MAXVER 0x06020000 or higher.
     if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
         SOURCES += [
             'DrawTargetD2D1.cpp',
             'FilterNodeD2D1.cpp',
             'RadialGradientEffectD2D1.cpp',
             'SourceSurfaceD2D1.cpp'
         ]
         DEFINES['USE_D2D1_1'] = True
-    if CONFIG['MOZ_ENABLE_SKIA']:
-        SOURCES += [
-            'ScaledFontWin.cpp',
-        ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     UNIFIED_SOURCES += [
         'convolver.cpp',
         'DrawTargetSkia.cpp',
         'PathSkia.cpp',
         'SourceSurfaceSkia.cpp',
     ]