Bug 1436200 - Disable failing assertions until we have the proper fix in place. r?botond
MozReview-Commit-ID: 59aKg5oSrbl
--- 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) {