Bug 1296524 - Don't add Skia to the allowable canvas types unless USE_SKIA is defined. r=mchang, a=gchang
authorGeorge Wright <george@mozilla.com>
Mon, 22 Aug 2016 13:50:48 -0400
changeset 340454 f4870f71d0b587e78c1179c503b112cf89dccd3e
parent 340453 4c552e7562362b5736687587d1e4375e9cdff6b3
child 340455 a84b57a1e9f8ce75b8435cb40bf6f7a1576a422d
push id6338
push userryanvm@gmail.com
push dateThu, 25 Aug 2016 03:41:03 +0000
treeherdermozilla-beta@a84b57a1e9f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmchang, gchang
bugs1296524
milestone49.0
Bug 1296524 - Don't add Skia to the allowable canvas types unless USE_SKIA is defined. r=mchang, a=gchang
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -496,17 +496,20 @@ gfxPlatform::gfxPlatform()
     mWordCacheCharLimit = UNINITIALIZED_VALUE;
     mWordCacheMaxEntries = UNINITIALIZED_VALUE;
     mGraphiteShapingEnabled = UNINITIALIZED_VALUE;
     mOpenTypeSVGEnabled = UNINITIALIZED_VALUE;
     mBidiNumeralOption = UNINITIALIZED_VALUE;
 
     mSkiaGlue = nullptr;
 
-    uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO) | BackendTypeBit(BackendType::SKIA);
+    uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO);
+#ifdef USE_SKIA
+    canvasMask |= BackendTypeBit(BackendType::SKIA);
+#endif
     uint32_t contentMask = BackendTypeBit(BackendType::CAIRO);
     InitBackendPrefs(canvasMask, BackendType::CAIRO,
                      contentMask, BackendType::CAIRO);
     mTotalSystemMemory = mozilla::hal::GetTotalSystemMemory();
 
     VRManager::ManagerInit();
 }