Bug 870390 - Remove the bit of code that forces the d2d backend on for metrofx. r=bbondy
authorJim Mathies <jmathies@mozilla.com>
Wed, 26 Jun 2013 19:31:56 -0500
changeset 149801 8d8e2e2734fc5df3f63832cf2e799bd0b3ba3594
parent 149800 01928dac9556c4461a0f38ecc176bfbe0bd8f1b7
child 149802 c4abdcc3451cb6cc74d5b87ca6a8cac5557fbe29
push id382
push userakeybl@mozilla.com
push dateMon, 21 Oct 2013 21:47:13 +0000
treeherdermozilla-release@5f1868ee45cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs870390
milestone25.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 870390 - Remove the bit of code that forces the d2d backend on for metrofx. r=bbondy
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -436,21 +436,16 @@ gfxWindowsPlatform::UpdateRenderMode()
         }
     }
 
     // These will only be evaluated once, and any subsequent changes to
     // the preferences will be ignored until restart.
     d2dDisabled = OncePreferenceDirect2DDisabled();
     d2dForceEnabled = OncePreferenceDirect2DForceEnabled();
 
-#ifdef MOZ_METRO
-    // In Metro mode there is no fallback available
-    d2dForceEnabled |= IsRunningInWindowsMetro();
-#endif
-
     bool tryD2D = !d2dBlocked || d2dForceEnabled;
 
     // Do not ever try if d2d is explicitly disabled,
     // or if we're not using DWrite fonts.
     if (d2dDisabled || mUsingGDIFonts) {
         tryD2D = false;
     }