Make sure to not finish the reflow command hash till we've cancelled all
commands on shutdown. Bug 242602, r+sr=dbaron git-svn-id: svn://10.0.0.236/trunk@155936 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
d19f1f728a
commit
a6e1e6353e
@ -1902,10 +1902,6 @@ PresShell::Destroy()
|
||||
if (mHaveShutDown)
|
||||
return NS_OK;
|
||||
|
||||
if (mReflowCommandTable.ops) {
|
||||
PL_DHashTableFinish(&mReflowCommandTable);
|
||||
}
|
||||
|
||||
// If our paint suppression timer is still active, kill it.
|
||||
if (mPaintSuppressionTimer) {
|
||||
mPaintSuppressionTimer->Cancel();
|
||||
@ -1987,8 +1983,14 @@ PresShell::Destroy()
|
||||
eventQueue->RevokeEvents(this);
|
||||
|
||||
CancelAllReflowCommands();
|
||||
|
||||
KillResizeEventTimer();
|
||||
|
||||
// Now that mReflowCommandTable won't be accessed anymore, finish it
|
||||
if (mReflowCommandTable.ops) {
|
||||
PL_DHashTableFinish(&mReflowCommandTable);
|
||||
}
|
||||
|
||||
mHaveShutDown = PR_TRUE;
|
||||
|
||||
return NS_OK;
|
||||
|
||||
@ -1902,10 +1902,6 @@ PresShell::Destroy()
|
||||
if (mHaveShutDown)
|
||||
return NS_OK;
|
||||
|
||||
if (mReflowCommandTable.ops) {
|
||||
PL_DHashTableFinish(&mReflowCommandTable);
|
||||
}
|
||||
|
||||
// If our paint suppression timer is still active, kill it.
|
||||
if (mPaintSuppressionTimer) {
|
||||
mPaintSuppressionTimer->Cancel();
|
||||
@ -1987,8 +1983,14 @@ PresShell::Destroy()
|
||||
eventQueue->RevokeEvents(this);
|
||||
|
||||
CancelAllReflowCommands();
|
||||
|
||||
KillResizeEventTimer();
|
||||
|
||||
// Now that mReflowCommandTable won't be accessed anymore, finish it
|
||||
if (mReflowCommandTable.ops) {
|
||||
PL_DHashTableFinish(&mReflowCommandTable);
|
||||
}
|
||||
|
||||
mHaveShutDown = PR_TRUE;
|
||||
|
||||
return NS_OK;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user