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 1075137 patch 1 - Convert one use of IsProcessingRestyles that doesn't follow normal pattern to a debug-only member on the restyle manager. r=birtles

Browse Source
This commit is contained in:
L. David Baron 2014-10-02 21:53:23 -07:00
parent d120465d4b
commit e4428de7bf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/RestyleManager.cpp
View File

@ -74,6 +74,9 @@ RestyleManager::RestyleManager(nsPresContext* aPresContext)
ELEMENT_IS_POTENTIAL_RESTYLE_ROOT)
, mPendingAnimationRestyles(ELEMENT_HAS_PENDING_ANIMATION_RESTYLE |
ELEMENT_IS_POTENTIAL_ANIMATION_RESTYLE_ROOT)
#ifdef DEBUG
, mIsProcessingRestyles(false)
#endif
#ifdef RESTYLE_LOGGING
, mLoggingDepth(0)
#endif
@ -1430,6 +1433,10 @@ RestyleManager::RebuildAllStyleData(nsChangeHint aExtraHint)
nsAutoScriptBlocker scriptBlocker;
MOZ_ASSERT(!mIsProcessingRestyles, "Nesting calls to processing restyles");
#ifdef DEBUG
mIsProcessingRestyles = true;
#endif
mPresContext->SetProcessingRestyles(true);
// FIXME (bug 1047928): Many of the callers probably don't need
@ -1442,6 +1449,9 @@ RestyleManager::RebuildAllStyleData(nsChangeHint aExtraHint)
nsRestyleHint(eRestyle_Subtree |
eRestyle_ForceDescendants));
#ifdef DEBUG
mIsProcessingRestyles = false;
#endif
mPresContext->SetProcessingRestyles(false);
// Make sure that we process any pending animation restyles from the
@ -1511,8 +1521,11 @@ RestyleManager::ProcessPendingRestyles()
mPresContext->FrameConstructor()->CreateNeededFrames();
// Process non-animation restyles...
NS_ABORT_IF_FALSE(!mPresContext->IsProcessingRestyles(),
NS_ABORT_IF_FALSE(!mIsProcessingRestyles,
"Nesting calls to ProcessPendingRestyles?");
#ifdef DEBUG
mIsProcessingRestyles = true;
#endif
mPresContext->SetProcessingRestyles(true);
// Before we process any restyles, we need to ensure that style
@ -1545,6 +1558,9 @@ RestyleManager::ProcessPendingRestyles()
mPresContext->SetProcessingAnimationStyleChange(false);
mPresContext->SetProcessingRestyles(false);
#ifdef DEBUG
mIsProcessingRestyles = false;
#endif
NS_POSTCONDITION(mPendingRestyles.Count() == oldPendingRestyleCount,
"We should not have posted new non-animation restyles while "
"processing animation restyles");

4
layout/base/RestyleManager.h
View File

@ -443,6 +443,10 @@ private:
RestyleTracker mPendingRestyles;
RestyleTracker mPendingAnimationRestyles;
#ifdef DEBUG
bool mIsProcessingRestyles;
#endif
#ifdef RESTYLE_LOGGING
int32_t mLoggingDepth;
#endif