Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 705877 part 5. Make style reresolution actually use ancestor filters. r=dbaron

Browse Source
This commit is contained in:
Boris Zbarsky 2012-03-12 22:54:15 -05:00
parent 4e80e64553
commit 89ca391782
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/base/nsFrameManager.cpp
View File

@ -1141,6 +1141,11 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext,
parentContext = nsnull;
}
else {
MOZ_ASSERT(providerFrame->GetContent() == aFrame->GetContent(),
"Postcondition for GetParentStyleContextFrame() violated. "
"That means we need to add the current element to the "
"ancestor filter.");
// resolve the provider here (before aFrame below).
// assumeDifferenceHint forces the parent's change to be also
@ -1389,8 +1394,12 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext,
undisplayedParent = localContent;
}
if (checkUndisplayed && mUndisplayedMap) {
for (UndisplayedNode* undisplayed =
mUndisplayedMap->GetFirstNode(undisplayedParent);
UndisplayedNode* undisplayed =
mUndisplayedMap->GetFirstNode(undisplayedParent);
for (AncestorFilter::AutoAncestorPusher
pushAncestor(undisplayed, aTreeMatchContext.mAncestorFilter,
undisplayedParent ? undisplayedParent->AsElement()
: nsnull);
undisplayed; undisplayed = undisplayed->mNext) {
NS_ASSERTION(undisplayedParent ||
undisplayed->mContent ==
@ -1538,7 +1547,12 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext,
// now do children
nsIFrame::ChildListIterator lists(aFrame);
for (; !lists.IsDone(); lists.Next()) {
for (AncestorFilter::AutoAncestorPusher
pushAncestor(!lists.IsDone(),
aTreeMatchContext.mAncestorFilter,
content && content->IsElement() ? content->AsElement()
: nsnull);
!lists.IsDone(); lists.Next()) {
nsFrameList::Enumerator childFrames(lists.CurrentList());
for (; !childFrames.AtEnd(); childFrames.Next()) {
nsIFrame* child = childFrames.get();
@ -1649,8 +1663,9 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame *aFrame,
RestyleTracker& aRestyleTracker,
bool aRestyleDescendants)
{
nsIContent *content = aFrame->GetContent();
if (aMinChange) {
aChangeList->AppendChange(aFrame, aFrame->GetContent(), aMinChange);
aChangeList->AppendChange(aFrame, content, aMinChange);
}
nsChangeHint topLevelChange = aMinChange;
@ -1669,6 +1684,10 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame *aFrame,
TreeMatchContext treeMatchContext(true,
nsRuleWalker::eRelevantLinkUnvisited,
mPresShell->GetDocument());
nsIContent *parent = content ? content->GetParent() : nsnull;
Element *parentElement =
parent && parent->IsElement() ? parent->AsElement() : nsnull;
treeMatchContext.mAncestorFilter.Init(parentElement);
nsTArray<nsIContent*> visibleKidsOfHiddenElement;
do {
// Outer loop over special siblings

5
layout/generic/nsIFrame.h
View File

@ -2424,8 +2424,9 @@ public:
* Get the frame whose style context should be the parent of this
* frame's style context (i.e., provide the parent style context).
* This frame must either be an ancestor of this frame or a child. If
* this frame returns a child frame, then the child frame must be sure
* to return a grandparent or higher!
* this returns a child frame, then the child frame must be sure to
* return a grandparent or higher! Furthermore, if a child frame is
* returned it must have the same GetContent() as this frame.
*
* @return The frame whose style context should be the parent of this frame's
* style context. Null is permitted, and means that this frame's