Bug 956967. If we have to fallback to our default Azure backend, we must support that backend. r=nical
authorNicholas Cameron <ncameron@mozilla.com>
Sun, 12 Jan 2014 17:02:18 +1300
changeset 163036 3b1616997a89d23a2cf7fc8e359055225f74ed41
parent 163035 2b1118ec0cc1268b41338c6e6ce9fab4b55f72df
child 163037 f03891e62f0e868550a4b14d15c40b6eba90bcc2
push id25979
push usercbook@mozilla.com
push dateMon, 13 Jan 2014 11:46:02 +0000
treeherdermozilla-central@ea6657f1d682 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs956967
milestone29.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 956967. If we have to fallback to our default Azure backend, we must support that backend. r=nical
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1523,16 +1523,20 @@ gfxPlatform::InitBackendPrefs(uint32_t a
     }
     mFallbackCanvasBackend =
         GetCanvasBackendPref(aCanvasBitmask & ~BackendTypeBit(mPreferredCanvasBackend));
 
     mContentBackendBitmask = aContentBitmask;
     mContentBackend = GetContentBackendPref(mContentBackendBitmask);
     if (mContentBackend == BackendType::NONE) {
         mContentBackend = aContentDefault;
+        // mContentBackendBitmask is our canonical reference for supported
+        // backends so we need to add the default if we are using it and
+        // overriding the prefs.
+        mContentBackendBitmask |= BackendTypeBit(aContentDefault);
     }
 }
 
 /* static */ BackendType
 gfxPlatform::GetCanvasBackendPref(uint32_t aBackendBitmask)
 {
     return GetBackendPref("gfx.canvas.azure.backends", aBackendBitmask);
 }