Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c66945aba519 (bug 1638020) for perma failures on RetainedDisplayListBuilder.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Razvan Maries 2020-05-15 17:17:55 +03:00
parent fa3e4c8dc8
commit 9ff5cf0b0c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/painting/RetainedDisplayListBuilder.cpp
View File

@ -1027,17 +1027,16 @@ static bool ProcessFrameInternal(nsIFrame* aFrame,
MOZ_ASSERT(currentFrame);
nsIContent* content = currentFrame->GetContent();
nsRect displayPort;
const bool hasDisplayPort =
content && nsLayoutUtils::GetDisplayPort(content, &displayPort);
if (hasDisplayPort) {
if (nsLayoutUtils::FrameHasDisplayPort(currentFrame)) {
CRR_LOG("Frame belongs to displayport frame %p\n", currentFrame);
nsIScrollableFrame* sf = do_QueryFrame(currentFrame);
MOZ_ASSERT(sf);
// Get overflow relative to the scrollport (from the scrollframe)
nsRect displayPort;
DebugOnly<bool> hasDisplayPort = nsLayoutUtils::GetDisplayPort(
currentFrame->GetContent(), &displayPort,
DisplayportRelativeTo::ScrollPort);
MOZ_ASSERT(hasDisplayPort);
// get it relative to the scrollport (from the scrollframe)
nsRect r = aOverflow - sf->GetScrollPortRect().TopLeft();
r.IntersectRect(r, displayPort);
if (!r.IsEmpty()) {