Bug 1465892 - Re-enable assertions for WR hit-testing codepath. r=botond
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 01 Jun 2018 09:08:11 -0400
changeset 421659 8a711fdf59d088cbc50719646934712714dad436
parent 421658 fbab945ecae7cb7c67b2970336e9e6d24067e6d0
child 421660 033f5f2b2582611b02cf0ee732e3e471d2311aff
push id64950
push userkgupta@mozilla.com
push dateWed, 06 Jun 2018 22:19:13 +0000
treeherderautoland@8a711fdf59d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1465892
milestone62.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 1465892 - Re-enable assertions for WR hit-testing codepath. r=botond MozReview-Commit-ID: 489Gyhgf1C5
gfx/layers/apz/src/APZCTreeManager.cpp
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -2514,22 +2514,19 @@ APZCTreeManager::GetAPZCAtPointWR(const 
   if (!hitSomething) {
     return result.forget();
   }
 
   LayersId layersId = wr::AsLayersId(pipelineId);
   result = GetTargetAPZC(layersId, scrollId);
   if (!result) {
     // It falls back to the root
-    // Re-enable these assertions once bug 1391318 is fixed. For now there are
-    // race conditions with the WR hit-testing code that make these assertions
-    // fail.
-    //MOZ_ASSERT(scrollId == FrameMetrics::NULL_SCROLL_ID);
+    MOZ_ASSERT(scrollId == FrameMetrics::NULL_SCROLL_ID);
     result = FindRootApzcForLayersId(layersId);
-    //MOZ_ASSERT(result);
+    MOZ_ASSERT(result);
   }
 
   bool isScrollbar = bool(hitInfo & gfx::CompositorHitTestInfo::eScrollbar);
   bool isScrollbarThumb = bool(hitInfo & gfx::CompositorHitTestInfo::eScrollbarThumb);
   ScrollDirection direction = (hitInfo & gfx::CompositorHitTestInfo::eScrollbarVertical)
                             ? ScrollDirection::eVertical
                             : ScrollDirection::eHorizontal;
   if (isScrollbar || isScrollbarThumb) {