Backed out changeset e41148de8adf (bug 1531417) for failing at /browser_tabclose.js on a CLOSED TREE.
authorGurzau Raul <rgurzau@mozilla.com>
Fri, 01 Mar 2019 18:47:31 +0200
changeset 519975 5ab328aef1d472bbd0dfe3e237c2f0e698bcb88a
parent 519974 a9924d5ccbc67e09ce487a1adfe86c1571147a7f
child 519976 9453f4e1827d249f898b214f549c2fc08931d81c
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1531417
milestone67.0a1
backs oute41148de8adf5c5e19859d215c19280769bc8c19
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
Backed out changeset e41148de8adf (bug 1531417) for failing at /browser_tabclose.js on a CLOSED TREE.
dom/canvas/CanvasRenderingContext2D.cpp
modules/libpref/init/all.js
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -1349,23 +1349,16 @@ bool CanvasRenderingContext2D::TryShared
       (mBufferProvider->GetType() == LayersBackend::LAYERS_CLIENT ||
        mBufferProvider->GetType() == LayersBackend::LAYERS_WR)) {
     // we are already using a shared buffer provider, we are allocating a new
     // one because the current one failed so let's just fall back to the basic
     // provider.
     return false;
   }
 
-#ifdef XP_WIN
-  // Bug 1285271 - Disable shared buffer provider on Windows with D2D due to instability
-  if (gfxPlatform::GetPlatform()->GetPreferredCanvasBackend() == BackendType::DIRECT2D1_1) {
-    return false;
-  }
-#endif
-
   RefPtr<LayerManager> layerManager =
       LayerManagerFromCanvasElement(mCanvasElement);
 
   if (!layerManager) {
     return false;
   }
 
   aOutProvider = layerManager->CreatePersistentBufferProvider(
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5077,16 +5077,25 @@ pref("gfx.direct3d11.enable-debug-layer"
 pref("gfx.direct3d11.break-on-error", false);
 
 pref("layers.prefer-opengl", false);
 #endif
 
 // Copy-on-write canvas
 pref("layers.shared-buffer-provider.enabled", true);
 
+#ifdef XP_WIN
+pref("layers.shared-buffer-provider.enabled", false);
+#endif
+
+#ifdef XP_MACOSX
+// cf. Bug 1324908
+pref("layers.shared-buffer-provider.enabled", false);
+#endif
+
 // Force all possible layers to be always active layers
 pref("layers.force-active", false);
 
 // Enable/Disable the geolocation API for content
 pref("geo.enabled", true);
 
 // Timeout for outbound network geolocation provider XHR
 pref("geo.wifi.xhr.timeout", 60000);