wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 865745 - Remove nsFrameScriptExecutor::DestroyCx. r=smaug

Browse Source
This commit is contained in:
Bobby Holley 2013-06-29 18:44:06 -06:00
parent 493debc74c
commit e689963ce5
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsFrameMessageManager.cpp
View File

@ -859,12 +859,6 @@ nsFrameScriptExecutor::DidCreateGlobal()
}
}
void
nsFrameScriptExecutor::DestroyCx()
{
mGlobal = nullptr;
}
static PLDHashOperator
CachedScriptUnrooter(const nsAString& aKey,
nsFrameJSScriptExecutorHolder*& aData,

2
content/base/src/nsFrameMessageManager.h
View File

@ -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,

4
content/base/src/nsInProcessTabChildGlobal.cpp
View File

@ -246,9 +246,7 @@ nsInProcessTabChildGlobal::DelayedDisconnect()
if (!mLoadingScript) {
nsContentUtils::ReleaseWrapper(static_cast<EventTarget*>(this), this);
if (mGlobal) {
DestroyCx();
}
mGlobal = nullptr;
} else {
mDelayedDisconnect = true;
}

6
dom/ipc/TabChild.cpp
View File

@ -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) {