Backed out changeset a93c71a7ef8b (bug 1376026) for failures like DirectWrite not supported on Windows 2008 or older
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 06 Jul 2017 08:12:22 +0200
changeset 367591 e0f5d38b04fcda5f2b286eef5e437989ba4cb227
parent 367590 47ad4ca0f02fb693a7542c97f00653c806e3bb10
child 367592 16fb069369c932c5fef1d13020283a1eb0fd0ae2
push id32137
push usercbook@mozilla.com
push dateThu, 06 Jul 2017 09:18:21 +0000
treeherdermozilla-central@018b3829d0a7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1376026
milestone56.0a1
backs outa93c71a7ef8becbf808ee38b3a91b9536b9b90be
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
Backed out changeset a93c71a7ef8b (bug 1376026) for failures like DirectWrite not supported on Windows 2008 or older
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -383,16 +383,22 @@ gfxWindowsPlatform::CanUseHardwareVideoD
     return false;
   }
   return !dm->IsWARP() && gfxPlatform::CanUseHardwareVideoDecoding();
 }
 
 bool
 gfxWindowsPlatform::InitDWriteSupport()
 {
+  // DWrite is only supported on Windows 7 with the platform update and higher.
+  // We check this by seeing if D2D1 support is available.
+  if (!Factory::SupportsD2D1()) {
+    return false;
+  }
+
   mozilla::ScopedGfxFeatureReporter reporter("DWrite");
   decltype(DWriteCreateFactory)* createDWriteFactory = (decltype(DWriteCreateFactory)*)
       GetProcAddress(LoadLibraryW(L"dwrite.dll"), "DWriteCreateFactory");
   if (!createDWriteFactory) {
     return false;
   }
 
   // I need a direct pointer to be able to cast to IUnknown**, I also need to