Bug 1465892 - Re-enable assertions for WR hit-testing codepath. r?botond draft
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 01 Jun 2018 09:08:11 -0400
changeset 802789 3da437595a81b17827d0e231b2070364afc9da54
parent 802788 8831c43e2d8f117dad8a506a7636d6bd31c8a27f
push id111956
push userkgupta@mozilla.com
push dateFri, 01 Jun 2018 13:22:00 +0000
reviewersbotond
bugs1465892
milestone62.0a1
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) {