Bug 1267999 - An APZC cannot be checkerboarding if APZ is force-disabled for it. r=kats a=sylvestre
authorBotond Ballo <botond@mozilla.com>
Wed, 25 May 2016 19:38:39 -0400
changeset 333189 c376a953a79220ff0d026583dd3a3dbb7b77b999
parent 333188 34b32f5cb229db6eafbdaa653d079be1a6ca007e
child 333190 9eebb2835273857468a80e0e89013673352a37e7
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats, sylvestre
bugs1267999
milestone48.0a2
Bug 1267999 - An APZC cannot be checkerboarding if APZ is force-disabled for it. r=kats a=sylvestre MozReview-Commit-ID: Ai6aiRFBPl1
gfx/layers/apz/src/AsyncPanZoomController.cpp
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -3351,17 +3351,17 @@ AsyncPanZoomController::ReportCheckerboa
     }
     mCheckerboardEvent = nullptr;
   }
 }
 
 bool AsyncPanZoomController::IsCurrentlyCheckerboarding() const {
   ReentrantMonitorAutoEnter lock(mMonitor);
 
-  if (!gfxPrefs::APZAllowCheckerboarding()) {
+  if (!gfxPrefs::APZAllowCheckerboarding() || mFrameMetrics.IsApzForceDisabled()) {
     return false;
   }
 
   CSSPoint currentScrollOffset = mFrameMetrics.GetScrollOffset() + mTestAsyncScrollOffset;
   CSSRect painted = mLastContentPaintMetrics.GetDisplayPort() + mLastContentPaintMetrics.GetScrollOffset();
   painted.Inflate(CSSMargin::FromAppUnits(nsMargin(1, 1, 1, 1)));   // fuzz for rounding error
   CSSRect visible = CSSRect(currentScrollOffset, mFrameMetrics.CalculateCompositedSizeInCssPixels());
   if (painted.Contains(visible)) {