Bug 719776 - Part 3: Only include ScaledFontWin when using Skia. r=jrmuizel
authorBas Schouten <bschouten@mozilla.com>
Thu, 12 Apr 2012 02:03:07 +0200
changeset 91486 a964ce19e78f0e29b7782127d7f515f2721889eb
parent 91485 20218c1c79e0337a954adc6c68496e4f7d45c30d
child 91487 f27e0a7e5809528f5c10f616d8c891121b9cd244
push id22445
push usereakhgari@mozilla.com
push dateThu, 12 Apr 2012 16:19:55 +0000
treeherdermozilla-central@901dfde60183 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs719776
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 719776 - Part 3: Only include ScaledFontWin when using Skia. r=jrmuizel
gfx/2d/Factory.cpp
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -43,17 +43,17 @@
 #endif
 
 #ifdef USE_SKIA
 #include "DrawTargetSkia.h"
 #include "ScaledFontBase.h"
 #include "ScaledFontFreetype.h"
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && defined(USE_SKIA)
 #include "ScaledFontWin.h"
 #endif
 
 #ifdef XP_MACOSX
 #include "ScaledFontMac.h"
 #endif