Bug 1068590 - gfxWindowsPlatform does not build on WinXP. r=bas
authorRobert Longson <longsonr@gmail.com>
Wed, 17 Sep 2014 18:35:00 +0100
changeset 229105 29ba45e163d874fb94f74002305a72cfc513eb4f
parent 229104 ce0a75f9481b5c33867ddfa0b758685e2561913a
child 229106 f4e226d272443fa3515ae579e4d8fcd7b0cc292a
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs1068590
milestone35.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 1068590 - gfxWindowsPlatform does not build on WinXP. r=bas
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -438,22 +438,26 @@ gfxWindowsPlatform::UpdateRenderMode()
 #endif
 
     uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO);
     uint32_t contentMask = BackendTypeBit(BackendType::CAIRO);
     BackendType defaultBackend = BackendType::CAIRO;
     if (mRenderMode == RENDER_DIRECT2D) {
       canvasMask |= BackendTypeBit(BackendType::DIRECT2D);
       contentMask |= BackendTypeBit(BackendType::DIRECT2D);
+#ifdef USE_D2D1_1
       if (gfxPrefs::Direct2DUse1_1() && Factory::SupportsD2D1()) {
         contentMask |= BackendTypeBit(BackendType::DIRECT2D1_1);
         defaultBackend = BackendType::DIRECT2D1_1;
       } else {
+#endif
         defaultBackend = BackendType::DIRECT2D;
+#ifdef USE_D2D1_1
       }
+#endif
     } else {
       canvasMask |= BackendTypeBit(BackendType::SKIA);
     }
     contentMask |= BackendTypeBit(BackendType::SKIA);
     InitBackendPrefs(canvasMask, defaultBackend,
                      contentMask, defaultBackend);
 }
 
@@ -1531,9 +1535,10 @@ gfxWindowsPlatform::InitD3D11Devices()
 
     Factory::SetDirect3D11Device(mD3D11ContentDevice);
   }
 #endif
 
   // We leak these everywhere and we need them our entire runtime anyway, let's
   // leak it here as well.
   d3d11Module.disown();
-}
\ No newline at end of file
+}
+