mozilla-central: changeset 502486:859e84396f6dc4584bbb0d53be2756c26ca78ea0

author	Matt Woodrow <mwoodrow@mozilla.com>
	Mon, 18 Nov 2019 21:15:58 +0000
changeset 502486	859e84396f6dc4584bbb0d53be2756c26ca78ea0
parent 502485	765b9da8b818804ee68c8e18f92d2bdaa1794d8e
child 502487	93c199bb39288eb84cec5d26723a400263000f59
push id	36817
push user	ncsoregi@mozilla.com
push date	Tue, 19 Nov 2019 04:39:02 +0000
treeherder	mozilla-central@fdd07df83c87 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	lsalzman
bugs	1595093
milestone	72.0a1
first release with	nightly linux32 fdd07df83c87 / 72.0a1 / 20191119043902 / files nightly linux64 fdd07df83c87 / 72.0a1 / 20191119043902 / files nightly mac fdd07df83c87 / 72.0a1 / 20191119043902 / files nightly win32 fdd07df83c87 / 72.0a1 / 20191119043902 / files nightly win64 fdd07df83c87 / 72.0a1 / 20191119043902 / files
last release without	nightly linux32 4def8673359e / 72.0a1 / 20191117094823 / files nightly linux64 4def8673359e / 72.0a1 / 20191117094823 / files nightly mac 4def8673359e / 72.0a1 / 20191117094823 / files nightly win32 4def8673359e / 72.0a1 / 20191117094823 / files nightly win64 4def8673359e / 72.0a1 / 20191117094823 / files

--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1936,16 +1936,19 @@ void gfxPlatform::InitBackendPrefs(Backe
     mContentBackendBitmask |= BackendTypeBit(aPrefsData.mContentDefault);
   }
 
   uint32_t swBackendBits = BackendTypeBit(BackendType::SKIA);
 #ifdef MOZ_WIDGET_GTK
   swBackendBits |= BackendTypeBit(BackendType::CAIRO);
 #endif
   mSoftwareBackend = GetContentBackendPref(swBackendBits);
+  if (mSoftwareBackend == BackendType::NONE) {
+    mSoftwareBackend = BackendType::SKIA;
+  }
 
   if (XRE_IsParentProcess()) {
     gfxVars::SetContentBackend(mContentBackend);
     gfxVars::SetSoftwareBackend(mSoftwareBackend);
   }
 }
 
 /* static */