Backed out changeset d9626670ddb5 (bug 1657498) for causing multiple reftest failures.
authorMihai Alexandru Michis <malexandru@mozilla.com>
Fri, 14 Aug 2020 10:54:22 +0300
changeset 544632 605c404fbd80c67e1127ac054b8bec6742bd748f
parent 544631 44a65091d30270a181dc7e9593eb2b3e700ca1c7
child 544633 97e55e64d159e0186b4630567f1b4d7cd8a9b98d
push id37698
push userabutkovits@mozilla.com
push dateFri, 14 Aug 2020 09:45:24 +0000
treeherdermozilla-central@605c404fbd80 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1657498
milestone81.0a1
backs outd9626670ddb5cbbb8ddd959c63e8f77a92571eda
first release with
nightly linux32
605c404fbd80 / 81.0a1 / 20200814094524 / files
nightly linux64
605c404fbd80 / 81.0a1 / 20200814094524 / files
nightly mac
605c404fbd80 / 81.0a1 / 20200814094524 / files
nightly win32
605c404fbd80 / 81.0a1 / 20200814094524 / files
nightly win64
605c404fbd80 / 81.0a1 / 20200814094524 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset d9626670ddb5 (bug 1657498) for causing multiple reftest failures. CLOSED TREE
gfx/layers/wr/WebRenderLayerManager.cpp
gfx/layers/wr/WebRenderLayerManager.h
--- a/gfx/layers/wr/WebRenderLayerManager.cpp
+++ b/gfx/layers/wr/WebRenderLayerManager.cpp
@@ -9,17 +9,16 @@
 #include "BasicLayers.h"
 
 #include "GeckoProfiler.h"
 #include "LayersLogging.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/gfx/DrawEventRecorder.h"
-#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/StackingContextHelper.h"
 #include "mozilla/layers/TextureClient.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
 #include "mozilla/layers/UpdateImageHelper.h"
 #include "nsDisplayList.h"
 #include "WebRenderCanvasRenderer.h"
 
@@ -134,32 +133,16 @@ WebRenderLayerManager::~WebRenderLayerMa
   Destroy();
   MOZ_COUNT_DTOR(WebRenderLayerManager);
 }
 
 CompositorBridgeChild* WebRenderLayerManager::GetCompositorBridgeChild() {
   return WrBridge()->GetCompositorBridgeChild();
 }
 
-void WebRenderLayerManager::GetBackendName(nsAString& name) {
-  if (gfx::gfxVars::UseSoftwareWebRender()) {
-    name.AssignLiteral("WebRender (Software)");
-  } else {
-    name.AssignLiteral("WebRender");
-  }
-}
-
-const char* WebRenderLayerManager::Name() const {
-  if (gfx::gfxVars::UseSoftwareWebRender()) {
-    return "WebRender (Software)";
-  } else {
-    return "WebRender";
-  }
-}
-
 uint32_t WebRenderLayerManager::StartFrameTimeRecording(int32_t aBufferSize) {
   CompositorBridgeChild* renderer = GetCompositorBridgeChild();
   if (renderer) {
     uint32_t startIndex;
     renderer->SendStartFrameTimeRecording(aBufferSize, &startIndex);
     return startIndex;
   }
   return -1;
--- a/gfx/layers/wr/WebRenderLayerManager.h
+++ b/gfx/layers/wr/WebRenderLayerManager.h
@@ -76,18 +76,20 @@ class WebRenderLayerManager final : publ
   void EndTransactionWithoutLayer(
       nsDisplayList* aDisplayList, nsDisplayListBuilder* aDisplayListBuilder,
       WrFiltersHolder&& aFilters = WrFiltersHolder(),
       WebRenderBackgroundData* aBackground = nullptr);
   void EndTransaction(DrawPaintedLayerCallback aCallback, void* aCallbackData,
                       EndTransactionFlags aFlags = END_DEFAULT) override;
 
   LayersBackend GetBackendType() override { return LayersBackend::LAYERS_WR; }
-  void GetBackendName(nsAString& name) override;
-  const char* Name() const override;
+  void GetBackendName(nsAString& name) override {
+    name.AssignLiteral("WebRender");
+  }
+  const char* Name() const override { return "WebRender"; }
 
   void SetRoot(Layer* aLayer) override;
 
   already_AddRefed<PaintedLayer> CreatePaintedLayer() override {
     return nullptr;
   }
   already_AddRefed<ContainerLayer> CreateContainerLayer() override {
     return nullptr;