Bug 998377 - Remove mDelayedDisconnect and friends. r=smaug

This commit is contained in:
Bobby Holley 2014-04-18 16:00:06 -07:00
parent a9371e5350
commit e8f0ed897a
2 changed files with 1 additions and 11 deletions

View File

@ -101,7 +101,7 @@ nsInProcessTabChildGlobal::nsInProcessTabChildGlobal(nsIDocShell* aShell,
nsIContent* aOwner,
nsFrameMessageManager* aChrome)
: mDocShell(aShell), mInitialized(false), mLoadingScript(false),
mDelayedDisconnect(false), mOwner(aOwner), mChromeMessageManager(aChrome)
mOwner(aOwner), mChromeMessageManager(aChrome)
{
// If owner corresponds to an <iframe mozbrowser> or <iframe mozapp>, we'll
@ -234,11 +234,6 @@ nsInProcessTabChildGlobal::DelayedDisconnect()
if (mListenerManager) {
mListenerManager->Disconnect();
}
if (!mLoadingScript) {
} else {
mDelayedDisconnect = true;
}
}
NS_IMETHODIMP_(nsIContent *)
@ -329,8 +324,4 @@ nsInProcessTabChildGlobal::LoadFrameScript(const nsAString& aURL, bool aRunInGlo
mLoadingScript = true;
LoadFrameScriptInternal(aURL, aRunInGlobalScope);
mLoadingScript = tmp;
if (!mLoadingScript && mDelayedDisconnect) {
mDelayedDisconnect = false;
Disconnect();
}
}

View File

@ -161,7 +161,6 @@ protected:
nsCOMPtr<nsIDocShell> mDocShell;
bool mInitialized;
bool mLoadingScript;
bool mDelayedDisconnect;
// Is this the message manager for an in-process <iframe mozbrowser> or
// <iframe mozapp>? This affects where events get sent, so it affects