зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1574499 - nsWebBrowser::mIsActive / mActivating seem dead. r=farre
Differential Revision: https://phabricator.services.mozilla.com/D42314 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
78189c52eb
Коммит
6b8d2e3f18
|
@ -59,9 +59,7 @@ using namespace mozilla::layers;
|
|||
|
||||
nsWebBrowser::nsWebBrowser(int aItemType)
|
||||
: mContentType(aItemType),
|
||||
mActivating(false),
|
||||
mShouldEnableHistory(true),
|
||||
mIsActive(true),
|
||||
mParentNativeWindow(nullptr),
|
||||
mProgressListener(nullptr),
|
||||
mWidgetListenerDelegate(this),
|
||||
|
@ -1249,12 +1247,6 @@ nsWebBrowser::SetDocShell(nsIDocShell* aDocShell) {
|
|||
// By default, do not allow DNS prefetch, so we don't break our frozen
|
||||
// API. Embeddors who decide to enable it should do so manually.
|
||||
mDocShell->SetAllowDNSPrefetch(false);
|
||||
|
||||
// It's possible to call setIsActive() on us before we have a docshell.
|
||||
// If we're getting a docshell now, pass along our desired value. The
|
||||
// default here (true) matches the default of the docshell, so this is
|
||||
// a no-op unless setIsActive(false) has been called on us.
|
||||
mDocShell->SetIsActive(mIsActive);
|
||||
} else {
|
||||
if (mDocShellTreeOwner) {
|
||||
mDocShellTreeOwner->RemoveFromWatcher(); // evil twin of Add in Create()
|
||||
|
|
|
@ -149,9 +149,7 @@ class nsWebBrowser final : public nsIWebBrowser,
|
|||
nsCOMPtr<nsIWidget> mInternalWidget;
|
||||
nsCOMPtr<nsIWindowWatcher> mWWatch;
|
||||
const uint32_t mContentType;
|
||||
bool mActivating;
|
||||
bool mShouldEnableHistory;
|
||||
bool mIsActive;
|
||||
nativeWindow mParentNativeWindow;
|
||||
nsIWebProgressListener* mProgressListener;
|
||||
nsCOMPtr<nsIWebProgress> mWebProgress;
|
||||
|
|
Загрузка…
Ссылка в новой задаче