summaryrefslogtreecommitdiffstats
path: root/layout/generic/nsInlineFrame.cpp
diff options
context:
space:
mode:
authorMats Palmgren <mats@mozilla.com>2019-11-29 00:19:03 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-29 00:19:03 +0100
commit7070dddb4b8738ca983a12bc6e22b6e7418b2428 (patch)
tree405092afe285dcdf7a6844db2100369ec032f362 /layout/generic/nsInlineFrame.cpp
parentea03043bde6f3cef4fb20cd7ccb0a43339cc3cd2 (diff)
downloadUXP-7070dddb4b8738ca983a12bc6e22b6e7418b2428.tar
UXP-7070dddb4b8738ca983a12bc6e22b6e7418b2428.tar.gz
UXP-7070dddb4b8738ca983a12bc6e22b6e7418b2428.tar.lz
UXP-7070dddb4b8738ca983a12bc6e22b6e7418b2428.tar.xz
UXP-7070dddb4b8738ca983a12bc6e22b6e7418b2428.zip
Simplify the overflow child frame reparenting in
nsInlineFrame::DestroyFrom.
Diffstat (limited to 'layout/generic/nsInlineFrame.cpp')
-rw-r--r--layout/generic/nsInlineFrame.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 54d93c85a..5a04f0cd1 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -199,8 +199,7 @@ nsInlineFrame::DestroyFrom(nsIFrame* aDestructRoot)
// Fixup the parent pointers for any child frames on the OverflowList.
// nsIFrame::DestroyFrom depends on that to find the sticky scroll
// container (an ancestor).
- nsIFrame* lineContainer = nsLayoutUtils::FindNearestBlockAncestor(this);
- DrainSelfOverflowListInternal(eForDestroy, lineContainer);
+ overflowFrames->ApplySetParent(this);
}
nsContainerFrame::DestroyFrom(aDestructRoot);
}
@@ -508,8 +507,7 @@ nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags,
if (aLineContainer && aLineContainer->GetPrevContinuation()) {
ReparentFloatsForInlineChild(aLineContainer, firstChild, true);
}
- const bool doReparentSC =
- (aFlags & eInFirstLine) && !(aFlags & eForDestroy);
+ const bool doReparentSC = (aFlags & eInFirstLine);
RestyleManagerHandle restyleManager = PresContext()->RestyleManager();
for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) {
f->SetParent(this);