Simplify the overflow child frame reparenting...
This commit is contained in:
parent
697fd31c46
commit
8eb073fd11
|
@ -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);
|
||||
|
|
|
@ -175,9 +175,6 @@ private:
|
|||
enum DrainFlags {
|
||||
eDontReparentFrames = 1, // skip reparenting the overflow list frames
|
||||
eInFirstLine = 2, // the request is for an inline descendant of a nsFirstLineFrame
|
||||
eForDestroy = 4, // the request is from DestroyFrom; in this case we do the
|
||||
// minimal work required since the frame is about to be
|
||||
// destroyed (just fixup parent pointers)
|
||||
};
|
||||
/**
|
||||
* Move any frames on our overflow list to the end of our principal list.
|
||||
|
|
Loading…
Reference in New Issue