Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 00:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r=vidur. Add support for a new pref "layout.reflow.async.afterDocLoad" that enables async reflow in the pres shell only after the document is done loading. Cleaned up ExitReflowLock() so that it uses preferences to decide whether to do async reflow, not a parameter.

Browse Source
This commit is contained in:
nisheeth%netscape.com 2000-01-25 16:00:44 +00:00
parent b96fe68560
commit 9c6617b147
15 changed files with 101 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/nsFrameManager.cpp
View File

@ -758,7 +758,7 @@ FrameManager::HandlePLEvent(CantRenderReplacedElementEvent* aEvent)
frameManager->mPresShell->EnterReflowLock();
frameManager->mPresShell->GetPresContext(getter_AddRefs(presContext));
frameManager->mStyleSet->CantRenderReplacedElement(presContext, aEvent->mFrame);
frameManager->mPresShell->ExitReflowLock(PR_TRUE, PR_TRUE);
frameManager->mPresShell->ExitReflowLock(PR_TRUE);
}
void

2
layout/base/nsIPresShell.h
View File

@ -149,7 +149,7 @@ public:
NS_IMETHOD EnterReflowLock() = 0;
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow) = 0;
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow) = 0;
// Make shell be a document observer
NS_IMETHOD BeginObservingDocument() = 0;

75
layout/base/nsPresShell.cpp
View File

@ -129,6 +129,10 @@ static const size_t gMaxRecycledSize = 200;
// Set via the "layout.reflow.async" pref
static PRBool gDoAsyncReflow = PR_FALSE;
// Flag for enabling/disabling asynchronous reflow after the document has loaded.
// Set via the "layout.reflow.async.afterDocLoad" pref
static PRBool gDoAsyncReflowAfterDocLoad = PR_FALSE;
// Memory is allocated 4-byte aligned. We have recyclers for chunks up to
// 200 bytes
class FrameArena {
@ -295,7 +299,7 @@ public:
NS_IMETHOD GetFrameSelection(nsIFrameSelection** aSelection);
NS_IMETHOD EnterReflowLock();
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow);
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow);
NS_IMETHOD BeginObservingDocument();
NS_IMETHOD EndObservingDocument();
@ -605,9 +609,7 @@ PresShell::PresShell()
mCurrentEventContent = nsnull;
mCurrentEventFrame = nsnull;
EnableScrolling();
mPendingReflowEvent = PR_FALSE;
// XXX This is temporary code that should be removed once we've tested
// the "async reflow after document load" code path.
mPendingReflowEvent = PR_FALSE;
mDocumentIsLoading = PR_TRUE;
#ifdef DEBUG_nisheeth
@ -789,12 +791,14 @@ PresShell::Init(nsIDocument* aDocument,
// First, set the defaults
gMaxRCProcessingTime = NS_MAX_REFLOW_TIME;
gDoAsyncReflow = PR_FALSE;
gDoAsyncReflowAfterDocLoad = PR_FALSE;
// Get the prefs service
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result);
if (NS_SUCCEEDED(result)) {
prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime);
prefs->GetBoolPref("layout.reflow.async", &gDoAsyncReflow);
prefs->GetBoolPref("layout.reflow.async.afterDocLoad", &gDoAsyncReflowAfterDocLoad);
}
}
@ -822,14 +826,24 @@ PresShell::EnterReflowLock()
}
NS_IMETHODIMP
PresShell::ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow)
PresShell::ExitReflowLock(PRBool aTryToReflow)
{
PRUint32 newReflowLockCount = mReflowLockCount - 1;
if (newReflowLockCount == 0 && aTryToReflow) {
if (aDoSynchronousReflow)
ProcessReflowCommands(PR_FALSE);
else
/* If a) layout.reflow.async is true, OR
* b) layout.reflow.async.afterDocLoad is true AND the doc has finished loading
* Then
* Process the reflow commands asynchronously
* Else
* Process the reflow commands synchronously.
*/
if (gDoAsyncReflow ||
(gDoAsyncReflowAfterDocLoad && !mDocumentIsLoading)) {
PostReflowEvent();
}
else {
ProcessReflowCommands(PR_FALSE);
}
}
mReflowLockCount = newReflowLockCount;
return NS_OK;
@ -1164,7 +1178,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
MOZ_TIMER_STOP(mReflowWatch);
}
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (mViewManager && mCaret && !mViewEventListener) {
nsIScrollableView* scrollingView = nsnull;
@ -1264,7 +1278,7 @@ PresShell::ResizeReflow(nscoord aWidth, nscoord aHeight)
printf("PresShell::ResizeReflow: null root frame\n");
#endif
}
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return NS_OK; //XXX this needs to be real. MMP
}
@ -1317,6 +1331,9 @@ NS_IMETHODIMP PresShell::SetCaretEnabled(PRBool aInEnable)
if (mCaret && (mCaretEnabled != oldEnabled))
{
// Update the document's content and frame models.
if (mDocument) mDocument->FlushPendingNotifications();
if (mCaretEnabled)
result = mCaret->SetCaretVisible(PR_TRUE);
else
@ -1547,7 +1564,7 @@ PresShell::StyleChangeReflow()
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("exit nsPresShell::StyleChangeReflow"));
}
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return NS_OK; //XXX this needs to be real. MMP
}
@ -1672,9 +1689,8 @@ PresShell::EndLoad(nsIDocument *aDocument)
watch->PrintTimer(NS_TIMER_STYLE_RESOLUTION);
}
#endif
// XXX This is temporarily commented out so that this change can be tested locally.
// mDocumentIsLoading = PR_FALSE;
mDocumentIsLoading = PR_FALSE;
return NS_OK;
}
@ -1821,7 +1837,7 @@ struct ReflowEvent : public PLEvent {
presShell->SetReflowEventStatus(PR_FALSE);
presShell->EnterReflowLock();
presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE, PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
}
else
mPresShell = 0;
@ -2359,11 +2375,8 @@ PresShell::SetReflowEventStatus(PRBool aPending)
NS_IMETHODIMP
PresShell::FlushPendingNotifications()
{
// XXX This is temporarily commented out so that this change can be
// tested locally.
// return ProcessReflowCommands(PR_FALSE);
return NS_OK;
{
return ProcessReflowCommands(PR_FALSE);
}
NS_IMETHODIMP
@ -2374,7 +2387,7 @@ PresShell::ContentChanged(nsIDocument *aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentChanged(mPresContext, aContent, aSubContent);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2387,7 +2400,7 @@ PresShell::ContentStatesChanged(nsIDocument* aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentStatesChanged(mPresContext, aContent1, aContent2);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2403,7 +2416,7 @@ PresShell::AttributeChanged(nsIDocument *aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2430,7 +2443,7 @@ PresShell::ContentAppended(nsIDocument *aDocument,
MOZ_TIMER_DEBUGLOG(("Stop: Frame Creation: PresShell::ContentAppended(), this=%p\n", this));
MOZ_TIMER_STOP(mFrameCreationWatch);
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2443,7 +2456,7 @@ PresShell::ContentInserted(nsIDocument* aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentInserted(mPresContext, aContainer, aChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2458,7 +2471,7 @@ PresShell::ContentReplaced(nsIDocument* aDocument,
nsresult rv = mStyleSet->ContentReplaced(mPresContext, aContainer, aOldChild,
aNewChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2472,7 +2485,7 @@ PresShell::ContentRemoved(nsIDocument *aDocument,
nsresult rv = mStyleSet->ContentRemoved(mPresContext, aContainer,
aChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, mDocumentIsLoading);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2484,7 +2497,7 @@ PresShell::ReconstructFrames(void)
EnterReflowLock();
rv = mStyleSet->ReconstructDocElementHierarchy(mPresContext);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2521,7 +2534,7 @@ PresShell::StyleRuleChanged(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleChanged(mPresContext, aStyleSheet,
aStyleRule, aHint);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2534,7 +2547,7 @@ PresShell::StyleRuleAdded(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleAdded(mPresContext, aStyleSheet,
aStyleRule);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (NS_FAILED(rv)) {
return rv;
}
@ -2551,7 +2564,7 @@ PresShell::StyleRuleRemoved(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleRemoved(mPresContext, aStyleSheet,
aStyleRule);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (NS_FAILED(rv)) {
return rv;
}

2
layout/base/public/nsIPresShell.h
View File

@ -149,7 +149,7 @@ public:
NS_IMETHOD EnterReflowLock() = 0;
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow) = 0;
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow) = 0;
// Make shell be a document observer
NS_IMETHOD BeginObservingDocument() = 0;

2
layout/base/src/nsFrameImageLoader.cpp
View File

@ -506,7 +506,7 @@ nsFrameImageLoader::NotifyFrames(PRBool aIsSizeUpdate)
}
if (shell) {
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
NS_RELEASE(shell);
}
}

2
layout/forms/nsComboboxControlFrame.cpp
View File

@ -1194,7 +1194,7 @@ nsComboboxControlFrame::SelectionChanged()
if (NS_SUCCEEDED(rv) && shell) {
if (NS_SUCCEEDED(shell->EnterReflowLock())) {
shell->AppendReflowCommand(cmd);
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}
NS_RELEASE(cmd);

2
layout/forms/nsListControlFrame.cpp
View File

@ -334,7 +334,7 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
if (NS_FAILED(rv)) { return rv; }
rv = shell->AppendReflowCommand(cmd);
// must do this next line regardless of result of AppendReflowCommand
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}

2
layout/generic/nsBulletFrame.cpp
View File

@ -771,7 +771,7 @@ nsBulletFrame::UpdateBulletCB(nsIPresContext* aPresContext,
shell->EnterReflowLock();
shell->AppendReflowCommand(cmd);
NS_RELEASE(cmd);
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}
}

2
layout/html/base/src/nsBulletFrame.cpp
View File

@ -771,7 +771,7 @@ nsBulletFrame::UpdateBulletCB(nsIPresContext* aPresContext,
shell->EnterReflowLock();
shell->AppendReflowCommand(cmd);
NS_RELEASE(cmd);
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}
}

2
layout/html/base/src/nsFrameManager.cpp
View File

@ -758,7 +758,7 @@ FrameManager::HandlePLEvent(CantRenderReplacedElementEvent* aEvent)
frameManager->mPresShell->EnterReflowLock();
frameManager->mPresShell->GetPresContext(getter_AddRefs(presContext));
frameManager->mStyleSet->CantRenderReplacedElement(presContext, aEvent->mFrame);
frameManager->mPresShell->ExitReflowLock(PR_TRUE, PR_TRUE);
frameManager->mPresShell->ExitReflowLock(PR_TRUE);
}
void

75
layout/html/base/src/nsPresShell.cpp
View File

@ -129,6 +129,10 @@ static const size_t gMaxRecycledSize = 200;
// Set via the "layout.reflow.async" pref
static PRBool gDoAsyncReflow = PR_FALSE;
// Flag for enabling/disabling asynchronous reflow after the document has loaded.
// Set via the "layout.reflow.async.afterDocLoad" pref
static PRBool gDoAsyncReflowAfterDocLoad = PR_FALSE;
// Memory is allocated 4-byte aligned. We have recyclers for chunks up to
// 200 bytes
class FrameArena {
@ -295,7 +299,7 @@ public:
NS_IMETHOD GetFrameSelection(nsIFrameSelection** aSelection);
NS_IMETHOD EnterReflowLock();
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow);
NS_IMETHOD ExitReflowLock(PRBool aTryToReflow);
NS_IMETHOD BeginObservingDocument();
NS_IMETHOD EndObservingDocument();
@ -605,9 +609,7 @@ PresShell::PresShell()
mCurrentEventContent = nsnull;
mCurrentEventFrame = nsnull;
EnableScrolling();
mPendingReflowEvent = PR_FALSE;
// XXX This is temporary code that should be removed once we've tested
// the "async reflow after document load" code path.
mPendingReflowEvent = PR_FALSE;
mDocumentIsLoading = PR_TRUE;
#ifdef DEBUG_nisheeth
@ -789,12 +791,14 @@ PresShell::Init(nsIDocument* aDocument,
// First, set the defaults
gMaxRCProcessingTime = NS_MAX_REFLOW_TIME;
gDoAsyncReflow = PR_FALSE;
gDoAsyncReflowAfterDocLoad = PR_FALSE;
// Get the prefs service
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result);
if (NS_SUCCEEDED(result)) {
prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime);
prefs->GetBoolPref("layout.reflow.async", &gDoAsyncReflow);
prefs->GetBoolPref("layout.reflow.async.afterDocLoad", &gDoAsyncReflowAfterDocLoad);
}
}
@ -822,14 +826,24 @@ PresShell::EnterReflowLock()
}
NS_IMETHODIMP
PresShell::ExitReflowLock(PRBool aTryToReflow, PRBool aDoSynchronousReflow)
PresShell::ExitReflowLock(PRBool aTryToReflow)
{
PRUint32 newReflowLockCount = mReflowLockCount - 1;
if (newReflowLockCount == 0 && aTryToReflow) {
if (aDoSynchronousReflow)
ProcessReflowCommands(PR_FALSE);
else
/* If a) layout.reflow.async is true, OR
* b) layout.reflow.async.afterDocLoad is true AND the doc has finished loading
* Then
* Process the reflow commands asynchronously
* Else
* Process the reflow commands synchronously.
*/
if (gDoAsyncReflow ||
(gDoAsyncReflowAfterDocLoad && !mDocumentIsLoading)) {
PostReflowEvent();
}
else {
ProcessReflowCommands(PR_FALSE);
}
}
mReflowLockCount = newReflowLockCount;
return NS_OK;
@ -1164,7 +1178,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
MOZ_TIMER_STOP(mReflowWatch);
}
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (mViewManager && mCaret && !mViewEventListener) {
nsIScrollableView* scrollingView = nsnull;
@ -1264,7 +1278,7 @@ PresShell::ResizeReflow(nscoord aWidth, nscoord aHeight)
printf("PresShell::ResizeReflow: null root frame\n");
#endif
}
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return NS_OK; //XXX this needs to be real. MMP
}
@ -1317,6 +1331,9 @@ NS_IMETHODIMP PresShell::SetCaretEnabled(PRBool aInEnable)
if (mCaret && (mCaretEnabled != oldEnabled))
{
// Update the document's content and frame models.
if (mDocument) mDocument->FlushPendingNotifications();
if (mCaretEnabled)
result = mCaret->SetCaretVisible(PR_TRUE);
else
@ -1547,7 +1564,7 @@ PresShell::StyleChangeReflow()
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("exit nsPresShell::StyleChangeReflow"));
}
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return NS_OK; //XXX this needs to be real. MMP
}
@ -1672,9 +1689,8 @@ PresShell::EndLoad(nsIDocument *aDocument)
watch->PrintTimer(NS_TIMER_STYLE_RESOLUTION);
}
#endif
// XXX This is temporarily commented out so that this change can be tested locally.
// mDocumentIsLoading = PR_FALSE;
mDocumentIsLoading = PR_FALSE;
return NS_OK;
}
@ -1821,7 +1837,7 @@ struct ReflowEvent : public PLEvent {
presShell->SetReflowEventStatus(PR_FALSE);
presShell->EnterReflowLock();
presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE, PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
}
else
mPresShell = 0;
@ -2359,11 +2375,8 @@ PresShell::SetReflowEventStatus(PRBool aPending)
NS_IMETHODIMP
PresShell::FlushPendingNotifications()
{
// XXX This is temporarily commented out so that this change can be
// tested locally.
// return ProcessReflowCommands(PR_FALSE);
return NS_OK;
{
return ProcessReflowCommands(PR_FALSE);
}
NS_IMETHODIMP
@ -2374,7 +2387,7 @@ PresShell::ContentChanged(nsIDocument *aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentChanged(mPresContext, aContent, aSubContent);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2387,7 +2400,7 @@ PresShell::ContentStatesChanged(nsIDocument* aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentStatesChanged(mPresContext, aContent1, aContent2);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2403,7 +2416,7 @@ PresShell::AttributeChanged(nsIDocument *aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, !gDoAsyncReflow);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2430,7 +2443,7 @@ PresShell::ContentAppended(nsIDocument *aDocument,
MOZ_TIMER_DEBUGLOG(("Stop: Frame Creation: PresShell::ContentAppended(), this=%p\n", this));
MOZ_TIMER_STOP(mFrameCreationWatch);
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2443,7 +2456,7 @@ PresShell::ContentInserted(nsIDocument* aDocument,
EnterReflowLock();
nsresult rv = mStyleSet->ContentInserted(mPresContext, aContainer, aChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, (!gDoAsyncReflow && mDocumentIsLoading));
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2458,7 +2471,7 @@ PresShell::ContentReplaced(nsIDocument* aDocument,
nsresult rv = mStyleSet->ContentReplaced(mPresContext, aContainer, aOldChild,
aNewChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2472,7 +2485,7 @@ PresShell::ContentRemoved(nsIDocument *aDocument,
nsresult rv = mStyleSet->ContentRemoved(mPresContext, aContainer,
aChild, aIndexInContainer);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, mDocumentIsLoading);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2484,7 +2497,7 @@ PresShell::ReconstructFrames(void)
EnterReflowLock();
rv = mStyleSet->ReconstructDocElementHierarchy(mPresContext);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2521,7 +2534,7 @@ PresShell::StyleRuleChanged(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleChanged(mPresContext, aStyleSheet,
aStyleRule, aHint);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
return rv;
}
@ -2534,7 +2547,7 @@ PresShell::StyleRuleAdded(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleAdded(mPresContext, aStyleSheet,
aStyleRule);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (NS_FAILED(rv)) {
return rv;
}
@ -2551,7 +2564,7 @@ PresShell::StyleRuleRemoved(nsIDocument *aDocument,
nsresult rv = mStyleSet->StyleRuleRemoved(mPresContext, aStyleSheet,
aStyleRule);
VERIFY_STYLE_TREE;
ExitReflowLock(PR_TRUE, PR_TRUE);
ExitReflowLock(PR_TRUE);
if (NS_FAILED(rv)) {
return rv;
}

2
layout/html/forms/src/nsComboboxControlFrame.cpp
View File

@ -1194,7 +1194,7 @@ nsComboboxControlFrame::SelectionChanged()
if (NS_SUCCEEDED(rv) && shell) {
if (NS_SUCCEEDED(shell->EnterReflowLock())) {
shell->AppendReflowCommand(cmd);
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}
NS_RELEASE(cmd);

2
layout/html/forms/src/nsGfxListControlFrame.cpp
View File

@ -331,7 +331,7 @@ nsGfxListControlFrame::Reflow(nsIPresContext* aPresContext,
if (NS_FAILED(rv)) { return rv; }
rv = shell->AppendReflowCommand(cmd);
// must do this next line regardless of result of AppendReflowCommand
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}

2
layout/html/forms/src/nsGfxTextControlFrame.cpp
View File

@ -1059,7 +1059,7 @@ nsGfxTextControlFrame::CreateSubDoc(nsRect *aSizeOfSubdocContainer)
if (NS_FAILED(rv)) { return rv; }
rv = shell->AppendReflowCommand(cmd);
// must do this next line regardless of result of AppendReflowCommand
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
return rv;
}

2
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -334,7 +334,7 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
if (NS_FAILED(rv)) { return rv; }
rv = shell->AppendReflowCommand(cmd);
// must do this next line regardless of result of AppendReflowCommand
shell->ExitReflowLock(PR_TRUE, PR_TRUE);
shell->ExitReflowLock(PR_TRUE);
}
}