Enable D2D by default again.
authorBas Schouten <bschouten@mozilla.com>
Wed, 18 Aug 2010 05:43:49 +0200
changeset 50774 42545f8d4b105743e6b3af7868eb5111415037b9
parent 50773 c15bdf67af57218ee628d5d196b53f4965602b7b
child 50775 a56f32372b9adb87994a5a772844240ca3b36383
push id15157
push userbschouten@mozilla.com
push dateWed, 18 Aug 2010 03:52:53 +0000
treeherdermozilla-central@984f55359541 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b5pre
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
Enable D2D by default again.
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -186,17 +186,17 @@ gfxWindowsPlatform::gfxWindowsPlatform()
     versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
     ::GetVersionExA(&versionInfo);
     bool isVistaOrHigher = versionInfo.dwMajorVersion >= 6;
 
 #ifdef CAIRO_HAS_D2D_SURFACE
     NS_RegisterMemoryReporter(new D2DCacheReporter());
     mD2DDevice = NULL;
 
-    if (isVistaOrHigher && 0) {
+    if (isVistaOrHigher) {
         // We need a DWriteFactory to work.
         HMODULE d3d10module = LoadLibraryA("d3d10_1.dll");
         D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func)
             GetProcAddress(d3d10module, "D3D10CreateDevice1");
         nsRefPtr<ID3D10Device1> device;
 
         if (createD3DDevice) {
             // We try 10.0 first even though we prefer 10.1, since we want to