merge mozilla-inbound to mozilla-central. r=merge a=merge

MozReview-Commit-ID: JhesEg4Bxjy

widget/nsBaseWidget.cpp

@@ -1293,12 +1293,7 @@ nsBaseWidget::CreateCompositorSession(int aWidth,
       if (textureFactoryIdentifier.mParentBackend != LayersBackend::LAYERS_WR) {
         retry = true;
         DestroyCompositor();
-        // Disable WebRender
-        gfx::gfxConfig::GetFeature(gfx::Feature::WEBRENDER).ForceDisable(
-          gfx::FeatureStatus::Unavailable,
-          "WebRender initialization failed",
-          NS_LITERAL_CSTRING("FEATURE_FAILURE_WEBRENDER_INITIALIZE"));
-        gfx::gfxVars::SetUseWebRender(false);
+        gfx::GPUProcessManager::Get()->DisableWebRender();
       }
     }