Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the overflow child frame reparenting...

master
Fedor 2019-12-25 15:46:48 +03:00
parent 697fd31c46
commit 8eb073fd11
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsInlineFrame.cpp
View File

@ -199,8 +199,7 @@ nsInlineFrame::DestroyFrom(nsIFrame* aDestructRoot)
// Fixup the parent pointers for any child frames on the OverflowList. // Fixup the parent pointers for any child frames on the OverflowList.
// nsIFrame::DestroyFrom depends on that to find the sticky scroll // nsIFrame::DestroyFrom depends on that to find the sticky scroll
// container (an ancestor). // container (an ancestor).
nsIFrame* lineContainer = nsLayoutUtils::FindNearestBlockAncestor(this); overflowFrames->ApplySetParent(this);
DrainSelfOverflowListInternal(eForDestroy, lineContainer);
} }
nsContainerFrame::DestroyFrom(aDestructRoot); nsContainerFrame::DestroyFrom(aDestructRoot);
} }
@ -508,8 +507,7 @@ nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags,
if (aLineContainer && aLineContainer->GetPrevContinuation()) { if (aLineContainer && aLineContainer->GetPrevContinuation()) {
ReparentFloatsForInlineChild(aLineContainer, firstChild, true); ReparentFloatsForInlineChild(aLineContainer, firstChild, true);
} }
const bool doReparentSC = const bool doReparentSC = (aFlags & eInFirstLine);
(aFlags & eInFirstLine) && !(aFlags & eForDestroy);
RestyleManagerHandle restyleManager = PresContext()->RestyleManager(); RestyleManagerHandle restyleManager = PresContext()->RestyleManager();
for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) { for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) {
f->SetParent(this); f->SetParent(this);

3
layout/generic/nsInlineFrame.h
View File

@ -175,9 +175,6 @@ private:
enum DrainFlags { enum DrainFlags {
eDontReparentFrames = 1, // skip reparenting the overflow list frames eDontReparentFrames = 1, // skip reparenting the overflow list frames
eInFirstLine = 2, // the request is for an inline descendant of a nsFirstLineFrame 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. * Move any frames on our overflow list to the end of our principal list.