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 1047928 patch 5 - Pass restyle hint to RestyleManager::PostRebuildAllStyleDataEvent. r=bzbarsky

Browse Source 
This patch is not intended to contain any changes in behavior.
This commit is contained in:
L. David Baron 2014-10-08 14:27:02 -07:00
parent a7e48bc5ef
commit 688f41fcb6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/RestyleManager.cpp
View File

@ -1689,7 +1689,8 @@ RestyleManager::PostRestyleEventInternal(bool aForLazyConstruction)
} }
void void
RestyleManager::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint) RestyleManager::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint,
nsRestyleHint aRestyleHint)
{ {
NS_ASSERTION(!(aExtraHint & nsChangeHint_ReconstructFrame), NS_ASSERTION(!(aExtraHint & nsChangeHint_ReconstructFrame),
"Should not reconstruct the root of the frame tree. " "Should not reconstruct the root of the frame tree. "
@ -1697,8 +1698,7 @@ RestyleManager::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint)
mRebuildAllStyleData = true; mRebuildAllStyleData = true;
NS_UpdateHint(mRebuildAllExtraHint, aExtraHint); NS_UpdateHint(mRebuildAllExtraHint, aExtraHint);
// FIXME: pass through from callers mRebuildAllRestyleHint |= aRestyleHint;
mRebuildAllRestyleHint = eRestyle_Subtree;
// Get a restyle event posted if necessary // Get a restyle event posted if necessary
PostRestyleEventInternal(false); PostRestyleEventInternal(false);

5
layout/base/RestyleManager.h
View File

@ -389,8 +389,11 @@ public:
* in a system font size, or to fix things up when an optimization in the * in a system font size, or to fix things up when an optimization in the
* style data has become invalid. We assume that the root frame will not * style data has become invalid. We assume that the root frame will not
* need to be reframed. * need to be reframed.
*
* For parameters, see RebuildAllStyleData.
*/ */
void PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint); void PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint,
nsRestyleHint aRestyleHint);
#ifdef RESTYLE_LOGGING #ifdef RESTYLE_LOGGING
/** /**

3
layout/base/nsPresContext.cpp
View File

@ -1877,7 +1877,8 @@ nsPresContext::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint)
// We must have been torn down. Nothing to do here. // We must have been torn down. Nothing to do here.
return; return;
} }
RestyleManager()->PostRebuildAllStyleDataEvent(aExtraHint); // FIXME: Pass through from callers.
RestyleManager()->PostRebuildAllStyleDataEvent(aExtraHint, eRestyle_Subtree);
} }
void void