mozilla-central: changeset 58461:f257e2a6cdcfdc97d81f87637492ae8057967d34

author	Jonathan Kew <jfkthame@gmail.com>
	Thu, 02 Dec 2010 10:37:17 +0000
changeset 58461	f257e2a6cdcfdc97d81f87637492ae8057967d34
parent 58460	8cec27abeda29ec99a1f447e03181133d14d03fe
child 58462	1429940f0fd25e75734cfda1fb407f927a49a156
push id	17309
push user	jkew@mozilla.com
push date	Thu, 02 Dec 2010 10:43:05 +0000
treeherder	mozilla-central@f257e2a6cdcf [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bas, blocking2.0
bugs	606419
milestone	2.0b8pre
first release with	nightly win64 f257e2a6cdcf / 4.0b8pre / 20101202044839 / files nightly linux32 0ff6d5984287 / 4.0b8pre / 20101203030309 / files nightly linux64 0ff6d5984287 / 4.0b8pre / 20101203030309 / files nightly mac 0ff6d5984287 / 4.0b8pre / 20101203030309 / files nightly win32 0ff6d5984287 / 4.0b8pre / 20101203030309 / files
last release without	nightly linux32 baa5ae44f0ba / 4.0b8pre / 20101202030316 / files nightly linux64 baa5ae44f0ba / 4.0b8pre / 20101202030316 / files nightly mac baa5ae44f0ba / 4.0b8pre / 20101202030316 / files nightly win32 baa5ae44f0ba / 4.0b8pre / 20101202030316 / files nightly win64 d1228efe31dd / 4.0b8pre / 20101201045207 / files
releases	nightly win64 4.0b8pre / 20101202044839 / pushlog to previous

--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -225,17 +225,17 @@ public:
         kWindows7 = 0x60001
     };
 
     static PRInt32 WindowsOSVersion();
 
     virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);
 
 #ifdef CAIRO_HAS_DWRITE_FONT
-    IDWriteFactory *GetDWriteFactory() { return mUseDirectWrite ? mDWriteFactory : nsnull; }
+    IDWriteFactory *GetDWriteFactory() { return mDWriteFactory; }
     inline PRBool DWriteEnabled() { return mUseDirectWrite; }
 #else
     inline PRBool DWriteEnabled() { return PR_FALSE; }
 #endif
 #ifdef CAIRO_HAS_D2D_SURFACE
     cairo_device_t *GetD2DDevice() { return mD2DDevice; }
     ID3D10Device1 *GetD3D10Device() { return mD2DDevice ? cairo_d2d_device_get_device(mD2DDevice) : nsnull; }
 #endif