mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1290335: Make ProcessRestyledFrames non static, and tidy up a bit. r=heycam 

MozReview-Commit-ID: 4aALVtI5DXT
This commit is contained in:
Emilio Cobos Álvarez 2016-08-02 15:47:19 -07:00
Родитель abbea0a9d6
Коммит 5d8a772fcd
5 изменённых файлов: 20 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
layout/base/RestyleManager.h
Просмотреть файл

@ -136,17 +136,6 @@ private:
public:
// Note: It's the caller's responsibility to make sure to wrap a
// ProcessRestyledFrames call in a view update batch and a script blocker.
// This function does not call ProcessAttachedQueue() on the binding manager.
// If the caller wants that to happen synchronously, it needs to handle that
// itself.
nsresult ProcessRestyledFrames(nsStyleChangeList& aChangeList) {
return base_type::ProcessRestyledFrames(aChangeList,
*PresContext(),
mOverflowChangedTracker);
}
/**
* In order to start CSS transitions on elements that are being
* reframed, we need to stash their style contexts somewhere during

27
layout/base/RestyleManagerBase.cpp
Просмотреть файл

@ -755,7 +755,7 @@ DoApplyRenderingChangeToTree(nsIFrame* aFrame,
}
}
/* static */ void
static void
SyncViewsAndInvalidateDescendants(nsIFrame* aFrame, nsChangeHint aChange)
{
NS_PRECONDITION(gInApplyRenderingChangeToTree,
@ -795,7 +795,7 @@ SyncViewsAndInvalidateDescendants(nsIFrame* aFrame, nsChangeHint aChange)
}
}
void
static void
ApplyRenderingChangeToTree(nsIPresShell* aPresShell,
nsIFrame* aFrame,
nsChangeHint aChange)
@ -955,10 +955,8 @@ RestyleManagerBase::GetNextContinuationWithSameStyle(
return nextContinuation;
}
/* static */ nsresult
RestyleManagerBase::ProcessRestyledFrames(
nsStyleChangeList& aChangeList, nsPresContext& aPresContext,
OverflowChangedTracker& aOverflowChangedTracker)
nsresult
RestyleManagerBase::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
{
NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
"Someone forgot a script blocker");
@ -969,8 +967,9 @@ RestyleManagerBase::ProcessRestyledFrames(
PROFILER_LABEL("RestyleManager", "ProcessRestyledFrames",
js::ProfileEntry::Category::CSS);
FramePropertyTable* propTable = aPresContext.PropertyTable();
nsCSSFrameConstructor* frameConstructor = aPresContext.FrameConstructor();
nsPresContext* presContext = PresContext();
FramePropertyTable* propTable = presContext->PropertyTable();
nsCSSFrameConstructor* frameConstructor = presContext->FrameConstructor();
// Make sure to not rebuild quote or counter lists while we're
// processing restyles
@ -1132,7 +1131,7 @@ RestyleManagerBase::ProcessRestyledFrames(
if (hint & (nsChangeHint_RepaintFrame | nsChangeHint_SyncFrameView |
nsChangeHint_UpdateOpacityLayer | nsChangeHint_UpdateTransformLayer |
nsChangeHint_ChildrenOnlyTransform | nsChangeHint_SchedulePaint)) {
ApplyRenderingChangeToTree(aPresContext.PresShell(), frame, hint);
ApplyRenderingChangeToTree(presContext->PresShell(), frame, hint);
}
if ((hint & nsChangeHint_RecomputePosition) && !didReflowThisFrame) {
ActiveLayerTracker::NotifyOffsetRestyle(frame);
@ -1152,7 +1151,7 @@ RestyleManagerBase::ProcessRestyledFrames(
if (hint & nsChangeHint_UpdateSubtreeOverflow) {
for (nsIFrame* cont = frame; cont; cont =
nsLayoutUtils::GetNextContinuationOrIBSplitSibling(cont)) {
AddSubtreeToOverflowTracker(cont, aOverflowChangedTracker);
AddSubtreeToOverflowTracker(cont, mOverflowChangedTracker);
}
// The work we just did in AddSubtreeToOverflowTracker
// subsumes some of the other hints:
@ -1176,7 +1175,7 @@ RestyleManagerBase::ProcessRestyledFrames(
// updating overflows since that will happen when it's reflowed.
if (!(childFrame->GetStateBits() &
(NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN))) {
aOverflowChangedTracker.AddFrame(childFrame,
mOverflowChangedTracker.AddFrame(childFrame,
OverflowChangedTracker::CHILDREN_CHANGED);
}
NS_ASSERTION(!nsLayoutUtils::GetNextContinuationOrIBSplitSibling(childFrame),
@ -1204,7 +1203,7 @@ RestyleManagerBase::ProcessRestyledFrames(
}
for (nsIFrame* cont = frame; cont; cont =
nsLayoutUtils::GetNextContinuationOrIBSplitSibling(cont)) {
aOverflowChangedTracker.AddFrame(cont, changeKind);
mOverflowChangedTracker.AddFrame(cont, changeKind);
}
}
// UpdateParentOverflow hints need to be processed in addition
@ -1216,14 +1215,14 @@ RestyleManagerBase::ProcessRestyledFrames(
"shouldn't get style hints for the root frame");
for (nsIFrame* cont = frame; cont; cont =
nsLayoutUtils::GetNextContinuationOrIBSplitSibling(cont)) {
aOverflowChangedTracker.AddFrame(cont->GetParent(),
mOverflowChangedTracker.AddFrame(cont->GetParent(),
OverflowChangedTracker::CHILDREN_CHANGED);
}
}
}
}
if ((hint & nsChangeHint_UpdateCursor) && !didUpdateCursor) {
aPresContext.PresShell()->SynthesizeMouseMove(false);
presContext->PresShell()->SynthesizeMouseMove(false);
didUpdateCursor = true;
}
}

12
layout/base/RestyleManagerBase.h
Просмотреть файл

@ -64,6 +64,13 @@ public:
mOverflowChangedTracker.RemoveFrame(aFrame);
}
// Note: It's the caller's responsibility to make sure to wrap a
// ProcessRestyledFrames call in a view update batch and a script blocker.
// This function does not call ProcessAttachedQueue() on the binding manager.
// If the caller wants that to happen synchronously, it needs to handle that
// itself.
nsresult ProcessRestyledFrames(nsStyleChangeList& aChangeList);
protected:
void ContentStateChangedInternal(Element* aElement,
EventStates aStateMask,
@ -126,11 +133,6 @@ protected:
static nsIFrame*
GetNextBlockInInlineSibling(FramePropertyTable* aPropTable, nsIFrame* aFrame);
static nsresult
ProcessRestyledFrames(nsStyleChangeList& aChangeList,
nsPresContext& aPresContext,
OverflowChangedTracker& aOverflowChangedTracker);
/**
* Get the next continuation or similar ib-split sibling (assuming
* block/inline alternation), conditionally on it having the same style.

7
layout/base/ServoRestyleManager.cpp
Просмотреть файл

@ -366,11 +366,4 @@ ServoRestyleManager::SnapshotForElement(Element* aElement)
return mModifiedElements.LookupOrAdd(aElement, aElement);
}
nsresult
ServoRestyleManager::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
{
return base_type::ProcessRestyledFrames(aChangeList, *PresContext(),
mOverflowChangedTracker);
}
} // namespace mozilla

1
layout/base/ServoRestyleManager.h
Просмотреть файл

@ -74,7 +74,6 @@ public:
}
nsresult ReparentStyleContext(nsIFrame* aFrame);
nsresult ProcessRestyledFrames(nsStyleChangeList& aChangeList);
bool HasPendingRestyles() { return !mModifiedElements.IsEmpty(); }