зеркало из https://github.com/mozilla/gecko-dev.git
Bug 998377 - Remove mDelayedDisconnect and friends. r=smaug
This commit is contained in:
Родитель
cc7636944d
Коммит
3fc03f0b3e
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче