Bug 1531417 - fix browser test. r=me
authorLee Salzman <lsalzman@mozilla.com>
Fri, 01 Mar 2019 15:07:35 -0500
changeset 519989 c27077a06c6dc7d542034a36434f1041e3dcab31
parent 519988 a5009e4ff8296c813335469174a1b7753e8a017d
child 519990 280ea49c019b9bb8c19d265056e49a6ac08555d1
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)
reviewersme
bugs1531417
milestone67.0a1
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
Bug 1531417 - fix browser test. r=me
browser/base/content/test/performance/browser.ini
dom/canvas/CanvasRenderingContext2D.cpp
--- a/browser/base/content/test/performance/browser.ini
+++ b/browser/base/content/test/performance/browser.ini
@@ -22,17 +22,17 @@ skip-if = asan || debug || (os == 'win' 
 skip-if = !debug
 [browser_startup.js]
 [browser_startup_content.js]
 skip-if = !e10s
 [browser_startup_flicker.js]
 run-if = debug || devedition || nightly_build # Requires startupRecorder.js, which isn't shipped everywhere by default
 [browser_tabclose_grow.js]
 [browser_tabclose.js]
-skip-if = (os == 'win' && bits == 32) # Bug 1488537
+skip-if = (os == 'win' && bits == 32) || (os == 'mac') # Bug 1488537, Bug 1531417
 [browser_tabdetach.js]
 [browser_tabopen.js]
 skip-if = (verify && (os == 'mac'))
 [browser_tabopen_squeeze.js]
 [browser_tabstrip_overflow_underflow.js]
 skip-if = (verify && !debug && (os == 'win')) || (!debug && (os == 'win') && (bits == 32)) # Bug 1502255
 [browser_tabswitch.js]
 [browser_toolbariconcolor_restyles.js]
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -4559,20 +4559,17 @@ void CanvasRenderingContext2D::DrawWindo
   // Flush layout updates
   if (!(aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_DO_NOT_FLUSH)) {
     nsContentUtils::FlushLayoutForTree(aWindow.AsInner()->GetOuterWindow());
   }
 
   CompositionOp op = UsedOperation();
   bool discardContent =
       GlobalAlpha() == 1.0f &&
-      (op == CompositionOp::OP_OVER || op == CompositionOp::OP_SOURCE) &&
-      (!mBufferProvider ||
-        (mBufferProvider->GetType() != LayersBackend::LAYERS_CLIENT &&
-         mBufferProvider->GetType() != LayersBackend::LAYERS_WR));
+      (op == CompositionOp::OP_OVER || op == CompositionOp::OP_SOURCE);
   const gfx::Rect drawRect(aX, aY, aW, aH);
   EnsureTarget(discardContent ? &drawRect : nullptr);
   if (!IsTargetValid()) {
     return;
   }
 
   RefPtr<nsPresContext> presContext;
   nsIDocShell* docshell = aWindow.GetDocShell();