Bug 1465892 - Re-enable assertions for WR hit-testing codepath. r=botond

MozReview-Commit-ID: 489Gyhgf1C5

--HG--
extra : rebase_source : 05b1b10629e167ffa163166239bc4bab0f70c596
This commit is contained in:
Kartikaya Gupta 2018-06-01 09:08:11 -04:00
parent f80ca025d2
commit 1088aa797b

View File

@ -2519,12 +2519,9 @@ APZCTreeManager::GetAPZCAtPointWR(const ScreenPoint& aHitTestPoint,
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);