corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1478069: Remove useless ping-pong between flattened and light child. r=TYLin

Browse Source 
We verify the flattened tree is correct in VerifyFlatTree (in RestyleManager),
plus the post-condition still holds of course.

Differential Revision: https://phabricator.services.mozilla.com/D2331

MozReview-Commit-ID: 7ayEC2gSvYS
This commit is contained in:
Emilio Cobos Álvarez
2018-07-24 20:16:47 +02:00
parent ef46e516eb
commit 1b1d889db5
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -10168,26 +10168,11 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
NS_WARNING("ProcessChildren max depth exceeded");
}
InsertionPoint insertion(aFrame, nullptr);
FlattenedChildIterator iter(aContent);
const InsertionPoint insertion(aFrame, aContent);
for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
// Get the parent of the content and check if it is a XBL children element
// (if the content is a children element then parent != aContent because the
// FlattenedChildIterator will transitively iterate through <xbl:children>
// for default content). Push the children element as an ancestor here because
// it does not have a frame and would not otherwise be pushed as an ancestor.
insertion.mContainer = aContent;
// FIXME(emilio): This code can go away, child->GetFlattenedTreeParent()
// is always aContent, wtf.
nsIContent* parent = child->GetParent();
MOZ_ASSERT(parent, "Parent must be non-null because we are iterating children.");
if (parent != aContent && parent->IsElement()) {
insertion.mContainer = child->GetFlattenedTreeParent();
MOZ_ASSERT(insertion.mContainer == GetInsertionPoint(child).mContainer);
}
MOZ_ASSERT(insertion.mContainer == GetInsertionPoint(child).mContainer,
"GetInsertionPoint should agree with us");
if (addChildItems) {
AddFrameConstructionItems(aState, child, iter.XBLInvolved(), insertion,
itemsToConstruct);