Bug 992077 patch 3 - Stop using OverflowChangedTracker::CHILDREN_AND_PARENT_CHANGED for the UpdateOverflow and related hints. r=mats

This makes UpdateOverflow hint handling (which definitely did previously
need CHILDREN_AND_PARENT_CHANGED) and handling of related hints (which I
believe never actually needed CHILDREN_AND_PARENT_CHANGED) use the
CHILDREN_CHANGED hint in the overflow changed tracker, since use of
CHILDREN_AND_PARENT_CHANGED is no longer needed following the
introduction of the UpdateParentOverflow hint in patch 2.
This commit is contained in:
L. David Baron 2015-02-16 16:34:29 +13:00
Родитель 9cb83cbc59
Коммит 5a3d7683d5
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -589,7 +589,7 @@ RestyleManager::AddSubtreeToOverflowTracker(nsIFrame* aFrame)
{
mOverflowChangedTracker.AddFrame(
aFrame,
OverflowChangedTracker::CHILDREN_AND_PARENT_CHANGED);
OverflowChangedTracker::CHILDREN_CHANGED);
nsIFrame::ChildListIterator lists(aFrame);
for (; !lists.IsDone(); lists.Next()) {
nsFrameList::Enumerator childFrames(lists.CurrentList());
@ -855,7 +855,7 @@ RestyleManager::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
if (!(childFrame->GetStateBits() &
(NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN))) {
mOverflowChangedTracker.AddFrame(childFrame,
OverflowChangedTracker::CHILDREN_AND_PARENT_CHANGED);
OverflowChangedTracker::CHILDREN_CHANGED);
}
NS_ASSERTION(!nsLayoutUtils::GetNextContinuationOrIBSplitSibling(childFrame),
"SVG frames should not have continuations "
@ -874,11 +874,11 @@ RestyleManager::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
OverflowChangedTracker::ChangeKind changeKind;
// If we have both nsChangeHint_UpdateOverflow and
// nsChangeHint_UpdatePostTransformOverflow,
// CHILDREN_AND_PARENT_CHANGED is selected as it is
// CHILDREN_CHANGED is selected as it is
// strictly stronger.
if (hint & (nsChangeHint_UpdateOverflow |
nsChangeHint_UpdateSubtreeOverflow)) {
changeKind = OverflowChangedTracker::CHILDREN_AND_PARENT_CHANGED;
changeKind = OverflowChangedTracker::CHILDREN_CHANGED;
} else {
changeKind = OverflowChangedTracker::TRANSFORM_CHANGED;
}