Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't run XBL constructors during frame construction, ever. Bug 398006, r=sicking, sr=roc

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-10-18 20:51:15 -07:00
parent f1ab736796
commit 44f35d31d5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/src/base/nsDOMClassInfo.cpp
View File

@ -7009,7 +7009,12 @@ nsElementSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
} }
if (binding) { if (binding) {
binding->ExecuteAttachedHandler(); // Make sure the presshell is in a state where it's safe to execute script
PRBool safeToRunScript = PR_FALSE;
pctx->PresShell()->IsSafeToFlush(safeToRunScript);
if (safeToRunScript) {
binding->ExecuteAttachedHandler();
}
} }
return NS_OK; return NS_OK;

12
layout/base/nsPresShell.cpp
View File

@ -3332,7 +3332,11 @@ PresShell::RecreateFramesFor(nsIContent* aContent)
nsStyleChangeList changeList; nsStyleChangeList changeList;
changeList.AppendChange(nsnull, aContent, nsChangeHint_ReconstructFrame); changeList.AppendChange(nsnull, aContent, nsChangeHint_ReconstructFrame);
// Mark ourselves as not safe to flush while we're doing frame construction.
++mChangeNestCount;
nsresult rv = mFrameConstructor->ProcessRestyledFrames(changeList); nsresult rv = mFrameConstructor->ProcessRestyledFrames(changeList);
--mChangeNestCount;
mViewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC); mViewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
InvalidateAccessibleSubtree(aContent); InvalidateAccessibleSubtree(aContent);
@ -6031,6 +6035,10 @@ PresShell::DidCauseReflow()
if (--mChangeNestCount == 0) { if (--mChangeNestCount == 0) {
// We may have had more reflow commands appended to the queue during // We may have had more reflow commands appended to the queue during
// our reflow. Make sure these get processed at some point. // our reflow. Make sure these get processed at some point.
// XXXbz why is this really needed? ProcessReflowCommands handles posting
// reflow events if there are reflow roots remaining, and FrameNeedsReflow
// posts events as needed as well. I think we should remove this.
PostReflowEvent(); PostReflowEvent();
} }
@ -6375,7 +6383,11 @@ PresShell::Observe(nsISupports* aSubject,
nsStyleChangeList changeList; nsStyleChangeList changeList;
WalkFramesThroughPlaceholders(mPresContext, rootFrame, WalkFramesThroughPlaceholders(mPresContext, rootFrame,
ReframeImageBoxes, &changeList); ReframeImageBoxes, &changeList);
// Mark ourselves as not safe to flush while we're doing frame
// construction.
++mChangeNestCount;
mFrameConstructor->ProcessRestyledFrames(changeList); mFrameConstructor->ProcessRestyledFrames(changeList);
--mChangeNestCount;
mViewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC); mViewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY