зеркало из https://github.com/mozilla/gecko-dev.git
Bug 865745 - Remove nsFrameScriptExecutor::DestroyCx. r=smaug
This commit is contained in:
Родитель
de1af8dc4a
Коммит
20ac01a955
|
@ -859,12 +859,6 @@ nsFrameScriptExecutor::DidCreateGlobal()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
nsFrameScriptExecutor::DestroyCx()
|
||||
{
|
||||
mGlobal = nullptr;
|
||||
}
|
||||
|
||||
static PLDHashOperator
|
||||
CachedScriptUnrooter(const nsAString& aKey,
|
||||
nsFrameJSScriptExecutorHolder*& aData,
|
||||
|
|
|
@ -284,8 +284,6 @@ protected:
|
|||
~nsFrameScriptExecutor()
|
||||
{ MOZ_COUNT_DTOR(nsFrameScriptExecutor); }
|
||||
void DidCreateGlobal();
|
||||
// Call this when you want to destroy mCx.
|
||||
void DestroyCx();
|
||||
void LoadFrameScriptInternal(const nsAString& aURL);
|
||||
enum CacheFailedBehavior { EXECUTE_IF_CANT_CACHE, DONT_EXECUTE };
|
||||
void TryCacheLoadAndCompileScript(const nsAString& aURL,
|
||||
|
|
|
@ -246,9 +246,7 @@ nsInProcessTabChildGlobal::DelayedDisconnect()
|
|||
|
||||
if (!mLoadingScript) {
|
||||
nsContentUtils::ReleaseWrapper(static_cast<EventTarget*>(this), this);
|
||||
if (mGlobal) {
|
||||
DestroyCx();
|
||||
}
|
||||
mGlobal = nullptr;
|
||||
} else {
|
||||
mDelayedDisconnect = true;
|
||||
}
|
||||
|
|
|
@ -1145,10 +1145,8 @@ TabChild::~TabChild()
|
|||
if (webBrowser) {
|
||||
webBrowser->SetContainerWindow(nullptr);
|
||||
}
|
||||
if (mGlobal) {
|
||||
DestroyCx();
|
||||
}
|
||||
|
||||
mGlobal = nullptr;
|
||||
|
||||
if (mTabChildGlobal) {
|
||||
nsEventListenerManager* elm = mTabChildGlobal->GetListenerManager(false);
|
||||
if (elm) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче