Bug 1103868 - "'SupportsD2D1' : is not a member of 'mozilla::gfx::Factory'". r=bas
authorneil@parkwaycc.co.uk <neil>
Wed, 26 Nov 2014 01:33:00 +0100
changeset 242149 a5b0c43fe95140f176c025ad4cf8f8323cbd1618
parent 242148 e70f4f5c543f5d3c6b54d1dcd0b0f48b43b482b2
child 242150 45877c941f53fc81b02565bdf392a721bc97d068
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs1103868
milestone36.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 1103868 - "'SupportsD2D1' : is not a member of 'mozilla::gfx::Factory'". r=bas
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -614,22 +614,24 @@ gfxWindowsPlatform::VerifyD2DDevice(bool
         mD2DDevice = cairo_d2d_create_device();
     }
 
     if (mD2DDevice) {
         reporter.SetSuccessful();
         mozilla::gfx::Factory::SetDirect3D10Device(cairo_d2d_device_get_device(mD2DDevice));
     }
 
+#ifdef USE_D2D1_1
     ScopedGfxFeatureReporter reporter1_1("D2D1.1");
 
     if (Factory::SupportsD2D1()) {
       reporter1_1.SetSuccessful();
     }
 #endif
+#endif
 }
 
 gfxPlatformFontList*
 gfxWindowsPlatform::CreatePlatformFontList()
 {
     mUsingGDIFonts = false;
     gfxPlatformFontList *pfl;
 #ifdef CAIRO_HAS_DWRITE_FONT