зеркало из https://github.com/mozilla/gecko-dev.git
Bug 828312 patch 4.5: Pass the same aMinChange to the top level of a ReResolveStyleContext that we would for the recursive calls, rather than including previous continutaions in aMinChange. r=bzbarsky
This commit is contained in:
Родитель
903d3461e1
Коммит
74f00f4aa3
|
@ -1645,8 +1645,6 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame *aFrame,
|
||||||
aChangeList->AppendChange(aFrame, content, aMinChange);
|
aChangeList->AppendChange(aFrame, content, aMinChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
nsChangeHint topLevelChange = aMinChange;
|
|
||||||
|
|
||||||
nsIFrame* frame = aFrame;
|
nsIFrame* frame = aFrame;
|
||||||
nsIFrame* frame2 = aFrame;
|
nsIFrame* frame2 = aFrame;
|
||||||
|
|
||||||
|
@ -1672,16 +1670,15 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame *aFrame,
|
||||||
// Inner loop over next-in-flows of the current frame
|
// Inner loop over next-in-flows of the current frame
|
||||||
nsChangeHint frameChange =
|
nsChangeHint frameChange =
|
||||||
ReResolveStyleContext(GetPresContext(), frame, nullptr,
|
ReResolveStyleContext(GetPresContext(), frame, nullptr,
|
||||||
aChangeList, topLevelChange, nsChangeHint(0),
|
aChangeList, aMinChange, nsChangeHint(0),
|
||||||
aRestyleDescendants ?
|
aRestyleDescendants ?
|
||||||
eRestyle_Subtree : eRestyle_Self,
|
eRestyle_Subtree : eRestyle_Self,
|
||||||
aRestyleTracker,
|
aRestyleTracker,
|
||||||
eSendAllNotifications,
|
eSendAllNotifications,
|
||||||
visibleKidsOfHiddenElement,
|
visibleKidsOfHiddenElement,
|
||||||
treeMatchContext);
|
treeMatchContext);
|
||||||
NS_UpdateHint(topLevelChange, frameChange);
|
|
||||||
|
|
||||||
if (topLevelChange & nsChangeHint_ReconstructFrame) {
|
if (frameChange & nsChangeHint_ReconstructFrame) {
|
||||||
// If it's going to cause a framechange, then don't bother
|
// If it's going to cause a framechange, then don't bother
|
||||||
// with the continuations or special siblings since they'll be
|
// with the continuations or special siblings since they'll be
|
||||||
// clobbered by the frame reconstruct anyway.
|
// clobbered by the frame reconstruct anyway.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче