Disable D2D to fix browser_bug577990.js timeout
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Mon, 16 Aug 2010 09:35:40 -0400
changeset 50665 cee59a96297625fd5d8c87c8e9385ef2fe471496
parent 50664 68b886f9b3c3668ec0e4dbc9e44812788b8e490d
child 50666 2d55fbb0c71d3f9ba5a420652a2e906f77c4daf4
push idunknown
push userunknown
push dateunknown
bugs577990
milestone2.0b4pre
Disable D2D to fix browser_bug577990.js timeout
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) {
+    if (isVistaOrHigher && 0) {
         // 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