Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make all stylesheet changes do an async style reresolve, not a sync one. Bug

Browse Source 
314776, r+sr=dbaron
This commit is contained in:
bzbarsky%mit.edu 2005-11-06 18:01:17 +00:00
parent 4c21d0216f
commit 2b7fc1f0c9
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/nsCSSFrameConstructor.cpp
View File

@ -13250,6 +13250,10 @@ nsCSSFrameConstructor::ProcessPendingRestyles()
}
delete [] restylesToProcess;
#ifdef DEBUG
mPresShell->VerifyStyleTree();
#endif
}
void

13
layout/base/nsIPresShell.h
View File

@ -91,8 +91,8 @@ class nsCSSFrameConstructor;
class nsISelection;
#define NS_IPRESSHELL_IID \
{ 0x8be1b911, 0x7a04, 0x44e8, \
{ 0xaf, 0xaa, 0x17, 0x77, 0x26, 0x91, 0x8c, 0x19 } }
{ 0x759ceea6, 0x52c1, 0x4a39, \
{ 0x9f, 0xca, 0x1d, 0xf9, 0x9f, 0x40, 0xc9, 0xd3 } }
// Constants uses for ScrollFrameIntoView() function
#define NS_PRESSHELL_SCROLL_TOP 0
@ -209,7 +209,12 @@ public:
/*
* Called when stylesheets are added/removed/enabled/disabled to rebuild
* all style data for a given pres shell without necessarily reconstructing
* all of the frames.
* all of the frames. This will not reconstruct style synchronously; if
* you need to do that, call FlushPendingNotifications to flush out style
* reresolves.
* // XXXbz why do we have this on the interface anyway? The only consumer
* is calling AddOverrideStyleSheet/RemoveOverrideStyleSheet, and I think
* those should just handle reconstructing style data...
*/
virtual NS_HIDDEN_(void) ReconstructStyleDataExternal();
NS_HIDDEN_(void) ReconstructStyleDataInternal();
@ -672,6 +677,7 @@ public:
PRInt32 aIndent = 0) = 0;
virtual void ListStyleSheets(FILE *out, PRInt32 aIndent = 0) = 0;
virtual void VerifyStyleTree() = 0;
#endif
PRBool IsAccessibilityActive() { return mIsAccessibilityActive; }
@ -717,6 +723,7 @@ protected:
nsWeakPtr mForwardingContainer;
PRPackedBool mStylesHaveChanged;
PRPackedBool mDidInitialReflow;
#ifdef ACCESSIBILITY
/**

31
layout/base/nsPresShell.cpp
View File

@ -1260,6 +1260,7 @@ public:
PRInt32 aIndent = 0);
virtual void ListStyleSheets(FILE *out, PRInt32 aIndent = 0);
virtual void VerifyStyleTree();
#endif
#ifdef PR_LOGGING
@ -1342,7 +1343,6 @@ protected:
PRPackedBool mIsDestroying;
PRPackedBool mIsReleasingAnonymousContent;
PRPackedBool mDidInitialReflow;
PRPackedBool mIgnoreFrameDestruction;
PRPackedBool mHaveShutDown;
@ -1447,7 +1447,7 @@ VerifyStyleTree(nsPresContext* aPresContext, nsFrameManager* aFrameManager)
aFrameManager->DebugVerifyStyleTree(rootFrame);
}
}
#define VERIFY_STYLE_TREE VerifyStyleTree(mPresContext, FrameManager())
#define VERIFY_STYLE_TREE ::VerifyStyleTree(mPresContext, FrameManager())
#else
#define VERIFY_STYLE_TREE
#endif
@ -5208,20 +5208,18 @@ nsIPresShell::ReconstructStyleDataInternal()
{
mStylesHaveChanged = PR_FALSE;
nsIFrame* rootFrame = FrameManager()->GetRootFrame();
if (!rootFrame)
if (!mDidInitialReflow) {
// Nothing to do here, since we have no frames yet
return;
}
nsStyleChangeList changeList;
FrameManager()->ComputeStyleChangeFor(rootFrame, &changeList,
NS_STYLE_HINT_NONE);
NS_ASSERTION(mViewManager, "Should have view manager");
mViewManager->BeginUpdateViewBatch();
mFrameConstructor->ProcessRestyledFrames(changeList);
mViewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
VERIFY_STYLE_TREE;
nsIContent* root = mDocument->GetRootContent();
if (!root) {
// No content to restyle
return;
}
mFrameConstructor->PostRestyleEvent(root, eReStyle_Self, NS_STYLE_HINT_NONE);
#ifdef ACCESSIBILITY
InvalidateAccessibleSubtree(nsnull);
@ -7272,6 +7270,11 @@ PresShell::ListStyleSheets(FILE *out, PRInt32 aIndent)
}
}
void
PresShell::VerifyStyleTree()
{
VERIFY_STYLE_TREE;
}
#endif
// PresShellViewEventListener