Bug 1436200 - Disable failing assertions until we have the proper fix in place. r=botond
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 05 Mar 2018 09:47:53 -0500
changeset 461621 4e230122cb232925ed056206d3bc696203a98c4f
parent 461620 de07fd9fc0834e2a9efc4fc2fa7548ff6da2ef84
child 461622 b8b36764509e049c46840ab0f0aba01d561370c9
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1436200
milestone60.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 1436200 - Disable failing assertions until we have the proper fix in place. r=botond MozReview-Commit-ID: 59aKg5oSrbl
gfx/layers/apz/src/APZCTreeManager.cpp
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -2385,19 +2385,22 @@ APZCTreeManager::GetAPZCAtPointWR(const 
   uint64_t layersId = wr::AsUint64(pipelineId);
   RefPtr<HitTestingTreeNode> node = GetTargetNode(
       ScrollableLayerGuid(layersId, 0, scrollId),
       &GuidComparatorIgnoringPresShell);
   MOZ_ASSERT(!node || node->GetApzc()); // any node returned must have an APZC
   result = node ? node->GetApzc() : nullptr;
   if (!result) {
     // It falls back to the root
-    MOZ_ASSERT(scrollId == FrameMetrics::NULL_SCROLL_ID);
+    // 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);
     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) {