Bugzilla

Description: (v4) Do not run ScriptRunner in the intermediate state before destroying PreShell, PresContext, etc at nsDocumentViewer::Hide() is done. r=bz

Filename:

MIME Type:

Creator: Bevis Tseng[:bevis][:btseng](Exited)

Size: 1.68 KB

patch

># HG changeset patch ># User Bevis Tseng <btseng@mozilla.com> ># Date 1493032398 -28800 ># Mon Apr 24 19:13:18 2017 +0800 ># Node ID 446eebf5122bba7e76513efb081392990fb5f4db ># Parent c3e5497cff1c995821b1c9320fa71f1ef9a8c30e >Bug 1356558 - Do not run ScriptRunner in the intermediate state before destroying PreShell, PresContext, etc at nsDocumentViewer::Hide() is done. r=bz > > Do not run ScriptRunners queued by DestroyPresShell() in the intermediate state > before we're done destroying PresShell, PresContext, ViewManager, etc. > >MozReview-Commit-ID: LNP7Lp7zekS > >diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp >--- a/layout/base/nsDocumentViewer.cpp >+++ b/layout/base/nsDocumentViewer.cpp >@@ -2210,19 +2210,24 @@ nsDocumentViewer::Hide(void) > mPresShell->CaptureHistoryState(getter_AddRefs(layoutState)); > } > >- DestroyPresShell(); >- >- DestroyPresContext(); >- >- mViewManager = nullptr; >- mWindow = nullptr; >- mDeviceContext = nullptr; >- mParentWidget = nullptr; >- >- nsCOMPtr<nsIBaseWindow> base_win(mContainer); >- >- if (base_win && !mAttachedToParent) { >- base_win->SetParentWidget(nullptr); >+ { >+ // Do not run ScriptRunners queued by DestroyPresShell() in the intermediate >+ // state before we're done destroying PresShell, PresContext, ViewManager, etc. >+ nsAutoScriptBlocker scriptBlocker; >+ DestroyPresShell(); >+ >+ DestroyPresContext(); >+ >+ mViewManager = nullptr; >+ mWindow = nullptr; >+ mDeviceContext = nullptr; >+ mParentWidget = nullptr; >+ >+ nsCOMPtr<nsIBaseWindow> base_win(mContainer); >+ >+ if (base_win && !mAttachedToParent) { >+ base_win->SetParentWidget(nullptr); >+ } > } > > return NS_OK;

Flags:

bevis: review+
gchang: approval-mozilla-beta+
gchang: approval-mozilla-esr52+
dveditz: sec-approval+