wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 898209 patch 13: Create and use ElementRestyler::mTreeMatchContext. r=heycam

Browse Source
This commit is contained in:
L. David Baron 2013-07-30 17:36:10 -07:00
parent 812f86eb07
commit 8c05c48f7d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
layout/base/RestyleManager.cpp
View File

@ -1914,6 +1914,7 @@ ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
nsStyleChangeList* aChangeList,
nsChangeHint aHintsHandledByAncestors,
RestyleTracker& aRestyleTracker,
TreeMatchContext& aTreeMatchContext,
nsTArray<nsIContent*>&
aVisibleKidsOfHiddenElement)
: mPresContext(aPresContext)
@ -1928,6 +1929,7 @@ ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
, mParentFrameHintsNotHandledForDescendants(nsChangeHint(0))
, mHintsNotHandledForDescendants(nsChangeHint(0))
, mRestyleTracker(aRestyleTracker)
, mTreeMatchContext(aTreeMatchContext)
, mDesiredA11yNotifications(eSendAllNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
, mOurA11yNotification(eDontNotify)
@ -1950,6 +1952,7 @@ ElementRestyler::ElementRestyler(const ElementRestyler& aParentRestyler,
aParentRestyler.mHintsNotHandledForDescendants)
, mHintsNotHandledForDescendants(nsChangeHint(0))
, mRestyleTracker(aParentRestyler.mRestyleTracker)
, mTreeMatchContext(aParentRestyler.mTreeMatchContext)
, mDesiredA11yNotifications(aParentRestyler.mKidsDesiredA11yNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
, mOurA11yNotification(eDontNotify)
@ -1974,6 +1977,7 @@ ElementRestyler::ElementRestyler(ParentContextFromChildFrame,
nsChangeHint_Hints_NotHandledForDescendants)
, mHintsNotHandledForDescendants(nsChangeHint(0))
, mRestyleTracker(aParentRestyler.mRestyleTracker)
, mTreeMatchContext(aParentRestyler.mTreeMatchContext)
, mDesiredA11yNotifications(aParentRestyler.mDesiredA11yNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
, mOurA11yNotification(eDontNotify)
@ -2019,8 +2023,7 @@ ElementRestyler::CaptureChange(nsStyleContext* aOldContext,
* content node attached to the frame).
*/
void
ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
TreeMatchContext &aTreeMatchContext)
ElementRestyler::Restyle(nsRestyleHint aRestyleHint)
{
// It would be nice if we could make stronger assertions here; they
// would let us simplify the ?: expressions below setting |content|
@ -2105,8 +2108,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
ElementRestyler providerRestyler(PARENT_CONTEXT_FROM_CHILD_FRAME,
*this, providerFrame);
providerRestyler.Restyle(aRestyleHint,
aTreeMatchContext);
providerRestyler.Restyle(aRestyleHint);
assumeDifferenceHint = providerRestyler.HintsHandledForFrame();
// The provider's new context becomes the parent context of
@ -2221,7 +2223,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
newContext = styleSet->ProbePseudoElementStyle(element,
pseudoType,
parentContext,
aTreeMatchContext);
mTreeMatchContext);
if (!newContext) {
// This pseudo should no longer exist; gotta reframe
NS_UpdateHint(mHintsHandled, nsChangeHint_ReconstructFrame);
@ -2246,10 +2248,10 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
"non pseudo-element frame without content node");
// Skip flex-item style fixup for anonymous subtrees:
TreeMatchContext::AutoFlexItemStyleFixupSkipper
flexFixupSkipper(aTreeMatchContext,
flexFixupSkipper(mTreeMatchContext,
element->IsRootOfNativeAnonymousSubtree());
newContext = styleSet->ResolveStyleFor(element, parentContext,
aTreeMatchContext);
mTreeMatchContext);
}
}
@ -2351,7 +2353,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
UndisplayedNode* undisplayed =
frameConstructor->GetAllUndisplayedContentIn(undisplayedParent);
for (TreeMatchContext::AutoAncestorPusher
pushAncestor(undisplayed, aTreeMatchContext,
pushAncestor(undisplayed, mTreeMatchContext,
undisplayedParent ? undisplayedParent->AsElement()
: nullptr);
undisplayed; undisplayed = undisplayed->mNext) {
@ -2370,7 +2372,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
bool pushInsertionPoint = parent && parent->IsActiveChildrenElement();
TreeMatchContext::AutoAncestorPusher
insertionPointPusher(pushInsertionPoint,
aTreeMatchContext,
mTreeMatchContext,
parent && parent->IsElement() ? parent->AsElement() : nullptr);
nsRestyleHint thisChildHint = childRestyleHint;
@ -2385,7 +2387,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
undisplayedContext =
styleSet->ResolveStyleFor(undisplayed->mContent->AsElement(),
newContext,
aTreeMatchContext);
mTreeMatchContext);
} else {
undisplayedContext =
styleSet->ReparentStyleContext(undisplayed->mStyle, newContext,
@ -2518,7 +2520,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
nsIFrame::ChildListIterator lists(mFrame);
for (TreeMatchContext::AutoAncestorPusher
pushAncestor(!lists.IsDone(),
aTreeMatchContext,
mTreeMatchContext,
mContent && mContent->IsElement()
? mContent->AsElement() : nullptr);
!lists.IsDone(); lists.Next()) {
@ -2535,7 +2537,7 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
nsIContent* parent = child->GetContent() ? child->GetContent()->GetParent() : nullptr;
bool pushInsertionPoint = parent && parent->IsActiveChildrenElement();
TreeMatchContext::AutoAncestorPusher
insertionPointPusher(pushInsertionPoint, aTreeMatchContext,
insertionPointPusher(pushInsertionPoint, mTreeMatchContext,
parent && parent->IsElement() ? parent->AsElement() : nullptr);
// only do frames that are in flow
@ -2565,21 +2567,18 @@ ElementRestyler::Restyle(nsRestyleHint aRestyleHint,
oofRestyler.mHintsHandled =
NS_SubtractHint(oofRestyler.mHintsHandled,
nsChangeHint_AllReflowHints);
oofRestyler.Restyle(childRestyleHint,
aTreeMatchContext);
oofRestyler.Restyle(childRestyleHint);
} while ((outOfFlowFrame = outOfFlowFrame->GetNextContinuation()));
// reresolve placeholder's context under the same parent
// as the out-of-flow frame
ElementRestyler phRestyler(*this, child);
phRestyler.Restyle(childRestyleHint,
aTreeMatchContext);
phRestyler.Restyle(childRestyleHint);
}
else { // regular child frame
if (child != resolvedChild) {
ElementRestyler childRestyler(*this, child);
childRestyler.Restyle(childRestyleHint,
aTreeMatchContext);
childRestyler.Restyle(childRestyleHint);
}
}
}
@ -2661,10 +2660,10 @@ RestyleManager::ComputeStyleChangeFor(nsIFrame* aFrame,
// Inner loop over next-in-flows of the current frame
ElementRestyler restyler(mPresContext, frame, aChangeList,
aMinChange, aRestyleTracker,
treeMatchContext,
visibleKidsOfHiddenElement);
restyler.Restyle(aRestyleDescendants ? eRestyle_Subtree : eRestyle_Self,
treeMatchContext);
restyler.Restyle(aRestyleDescendants ? eRestyle_Subtree : eRestyle_Self);
if (restyler.HintsHandledForFrame() & nsChangeHint_ReconstructFrame) {
// If it's going to cause a framechange, then don't bother

5
layout/base/RestyleManager.h
View File

@ -276,6 +276,7 @@ public:
nsStyleChangeList* aChangeList,
nsChangeHint aHintsHandledByAncestors,
RestyleTracker& aRestyleTracker,
TreeMatchContext& aTreeMatchContext,
nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement);
// Construct for an element whose parent is being restyled.
@ -302,8 +303,7 @@ public:
* nsRestyleHint(0) to mean recompute a new style context for our
* current parent and existing rulenode, and the same for kids.
*/
void Restyle(nsRestyleHint aRestyleHint,
TreeMatchContext &aTreeMatchContext);
void Restyle(nsRestyleHint aRestyleHint);
/**
* mHintsHandled changes over time; it starts off as the hints that
@ -350,6 +350,7 @@ private:
nsChangeHint mParentFrameHintsNotHandledForDescendants;
nsChangeHint mHintsNotHandledForDescendants;
RestyleTracker& mRestyleTracker;
TreeMatchContext& mTreeMatchContext;
const DesiredA11yNotifications mDesiredA11yNotifications;
DesiredA11yNotifications mKidsDesiredA11yNotifications;