зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1115812 patch 8 - Call BeginProcessingRestyles and EndProcessingRestyles from DoRebuildAllStyleData. r=heycam
This fixes one of the omissions in the rebuild-all codepaths (where it incorrectly differs from the regular ProcessPendingRestyles codepath). Note that the explicit FlushOverflowChangedTracker() is no longer needed because that's part of EndProcessingRestyles. (This will all get refactored more substantially in the following patches.)
This commit is contained in:
Родитель
2b264a41d7
Коммит
4991382cc8
|
@ -1530,6 +1530,8 @@ RestyleManager::RebuildAllStyleData(nsChangeHint aExtraHint,
|
||||||
void
|
void
|
||||||
RestyleManager::DoRebuildAllStyleData(RestyleTracker& aRestyleTracker)
|
RestyleManager::DoRebuildAllStyleData(RestyleTracker& aRestyleTracker)
|
||||||
{
|
{
|
||||||
|
BeginProcessingRestyles();
|
||||||
|
|
||||||
mInRebuildAllStyleData = true;
|
mInRebuildAllStyleData = true;
|
||||||
|
|
||||||
// Tell the style set to get the old rule tree out of the way
|
// Tell the style set to get the old rule tree out of the way
|
||||||
|
@ -1578,7 +1580,8 @@ RestyleManager::DoRebuildAllStyleData(RestyleTracker& aRestyleTracker)
|
||||||
// Note: The restyle tracker we pass in here doesn't matter.
|
// Note: The restyle tracker we pass in here doesn't matter.
|
||||||
ComputeAndProcessStyleChange(mPresContext->PresShell()->GetRootFrame(),
|
ComputeAndProcessStyleChange(mPresContext->PresShell()->GetRootFrame(),
|
||||||
changeHint, aRestyleTracker, restyleHint);
|
changeHint, aRestyleTracker, restyleHint);
|
||||||
FlushOverflowChangedTracker();
|
|
||||||
|
EndProcessingRestyles();
|
||||||
|
|
||||||
if (mInRebuildAllStyleData) {
|
if (mInRebuildAllStyleData) {
|
||||||
// Tell the style set it's safe to destroy the old rule tree. We
|
// Tell the style set it's safe to destroy the old rule tree. We
|
||||||
|
|
Загрузка…
Ссылка в новой задаче