Bug 956967. If we have to fallback to our default Azure backend, we must support that backend. r=nical,a=lsblakk
authorNicholas Cameron <ncameron@mozilla.com>
Wed, 29 Jan 2014 14:46:32 +1300
changeset 176056 d1517e677805dca80d326ac119a0d258eb62e636
parent 176055 cff3be00c86d51fb00673f44cfe8b5f7d2eb3338
child 176057 f4a23af7c5c72442b091aa3fa77bfb63fb7c84b5
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical, lsblakk
bugs956967
milestone28.0a2
Bug 956967. If we have to fallback to our default Azure backend, we must support that backend. r=nical,a=lsblakk
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1510,16 +1510,20 @@ gfxPlatform::InitBackendPrefs(uint32_t a
     }
     mFallbackCanvasBackend =
         GetCanvasBackendPref(aCanvasBitmask & ~(1 << mPreferredCanvasBackend));
 
     mContentBackendBitmask = aContentBitmask;
     mContentBackend = GetContentBackendPref(mContentBackendBitmask);
     if (!mContentBackend) {
         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 |= 1 << aContentDefault;
     }
 }
 
 /* static */ BackendType
 gfxPlatform::GetCanvasBackendPref(uint32_t aBackendBitmask)
 {
     return GetBackendPref("gfx.canvas.azure.backends", aBackendBitmask);
 }