зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 3 changesets (bug 1615480) for causing build bustages on nsFrameLoader.cpp.
CLOSED TREE Backed out changeset d6fd08e3fccf (bug 1615480) Backed out changeset ad31eae54af2 (bug 1615480) Backed out changeset 70aff2593d98 (bug 1615480)
This commit is contained in:
Cosmin Sabou
Родитель
bab25b308b
Коммит
887b32be68
|
|
@ -146,7 +146,7 @@ typedef ScrollableLayerGuid::ViewID ViewID;
|
|||
// we'd need to re-institute a fixed version of bug 98158.
|
||||
#define MAX_DEPTH_CONTENT_FRAMES 10
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsFrameLoader, mPendingBrowsingContext,
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsFrameLoader, mBrowsingContext,
|
||||
mMessageManager, mChildMessageManager,
|
||||
mRemoteBrowser, mStaticCloneOf)
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameLoader)
|
||||
|
|
@ -161,7 +161,7 @@ NS_INTERFACE_MAP_END
|
|||
|
||||
nsFrameLoader::nsFrameLoader(Element* aOwner, BrowsingContext* aBrowsingContext,
|
||||
const nsAString& aRemoteType, bool aNetworkCreated)
|
||||
: mPendingBrowsingContext(aBrowsingContext),
|
||||
: mBrowsingContext(aBrowsingContext),
|
||||
mOwnerContent(aOwner),
|
||||
mDetachedSubdocFrame(nullptr),
|
||||
mPendingSwitchID(0),
|
||||
|
|
@ -1931,11 +1931,11 @@ void nsFrameLoader::DestroyDocShell() {
|
|||
GetDocShell()->Destroy();
|
||||
}
|
||||
|
||||
if (!mWillChangeProcess && mPendingBrowsingContext->EverAttached()) {
|
||||
mPendingBrowsingContext->Detach();
|
||||
if (!mWillChangeProcess && mBrowsingContext->EverAttached()) {
|
||||
mBrowsingContext->Detach();
|
||||
}
|
||||
|
||||
mPendingBrowsingContext = nullptr;
|
||||
mBrowsingContext = nullptr;
|
||||
mDocShell = nullptr;
|
||||
|
||||
if (mChildMessageManager) {
|
||||
|
|
@ -2051,19 +2051,19 @@ nsresult nsFrameLoader::MaybeCreateDocShell() {
|
|||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
|
||||
mPendingBrowsingContext->EnsureAttached();
|
||||
mBrowsingContext->EnsureAttached();
|
||||
|
||||
// nsDocShell::Create will attach itself to the passed browsing
|
||||
// context inside of nsDocShell::Create
|
||||
RefPtr<nsDocShell> docShell = nsDocShell::Create(mPendingBrowsingContext);
|
||||
RefPtr<nsDocShell> docShell = nsDocShell::Create(mBrowsingContext);
|
||||
NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
|
||||
mDocShell = docShell;
|
||||
|
||||
mPendingBrowsingContext->SetEmbedderElement(mOwnerContent);
|
||||
mPendingBrowsingContext->Embed();
|
||||
mBrowsingContext->SetEmbedderElement(mOwnerContent);
|
||||
mBrowsingContext->Embed();
|
||||
|
||||
mIsTopLevelContent = mPendingBrowsingContext->IsContent() &&
|
||||
!mPendingBrowsingContext->GetParent();
|
||||
mIsTopLevelContent =
|
||||
mBrowsingContext->IsContent() && !mBrowsingContext->GetParent();
|
||||
if (!mNetworkCreated && !mIsTopLevelContent) {
|
||||
docShell->SetCreatedDynamically(true);
|
||||
}
|
||||
|
|
@ -2172,7 +2172,7 @@ nsresult nsFrameLoader::MaybeCreateDocShell() {
|
|||
|
||||
if (OwnerIsMozBrowserFrame()) {
|
||||
docShell->SetFrameType(nsIDocShell::FRAME_TYPE_BROWSER);
|
||||
} else if (mPendingBrowsingContext->GetParent()) {
|
||||
} else if (mBrowsingContext->GetParent()) {
|
||||
docShell->SetIsFrame();
|
||||
}
|
||||
|
||||
|
|
@ -2542,7 +2542,7 @@ bool nsFrameLoader::TryRemoteBrowserInternal() {
|
|||
return false;
|
||||
}
|
||||
|
||||
mPendingBrowsingContext->EnsureAttached();
|
||||
mBrowsingContext->EnsureAttached();
|
||||
|
||||
RefPtr<ContentParent> openerContentParent;
|
||||
RefPtr<nsIPrincipal> openerContentPrincipal;
|
||||
|
|
@ -2607,8 +2607,7 @@ bool nsFrameLoader::TryRemoteBrowserInternal() {
|
|||
// opener, it asserts that its BrowserChild is bound to the same tab group
|
||||
// as its opener. There are likely other mismatches that it does not handle,
|
||||
// but those will all be fixed by the removal of TabGroups.
|
||||
if (RefPtr<BrowsingContext> openerBC =
|
||||
mPendingBrowsingContext->GetOpener()) {
|
||||
if (RefPtr<BrowsingContext> openerBC = mBrowsingContext->GetOpener()) {
|
||||
auto global = openerBC->Canonical()->GetCurrentWindowGlobal();
|
||||
if (global) {
|
||||
sameTabGroupAs = global->GetBrowserParent();
|
||||
|
|
@ -2657,8 +2656,8 @@ bool nsFrameLoader::TryRemoteBrowserInternal() {
|
|||
nsCOMPtr<Element> ownerElement = mOwnerContent;
|
||||
|
||||
mRemoteBrowser = ContentParent::CreateBrowser(
|
||||
context, ownerElement, mRemoteType, mPendingBrowsingContext,
|
||||
openerContentParent, sameTabGroupAs, nextRemoteTabId);
|
||||
context, ownerElement, mRemoteType, mBrowsingContext, openerContentParent,
|
||||
sameTabGroupAs, nextRemoteTabId);
|
||||
if (!mRemoteBrowser) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2666,10 +2665,10 @@ bool nsFrameLoader::TryRemoteBrowserInternal() {
|
|||
// browser, which already has its own BrowsingContext. If so, we need to
|
||||
// detach our original BC and take ownership of the one from the remote
|
||||
// browser.
|
||||
if (mPendingBrowsingContext != mRemoteBrowser->GetBrowsingContext()) {
|
||||
if (mBrowsingContext != mRemoteBrowser->GetBrowsingContext()) {
|
||||
MOZ_DIAGNOSTIC_ASSERT(nextRemoteTabId);
|
||||
mPendingBrowsingContext->Detach();
|
||||
mPendingBrowsingContext = mRemoteBrowser->GetBrowsingContext();
|
||||
mBrowsingContext->Detach();
|
||||
mBrowsingContext = mRemoteBrowser->GetBrowsingContext();
|
||||
}
|
||||
|
||||
mRemoteBrowser->GetBrowsingContext()->Embed();
|
||||
|
|
@ -2705,7 +2704,7 @@ bool nsFrameLoader::TryRemoteBrowserInternal() {
|
|||
nsAutoString frameName;
|
||||
mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, frameName);
|
||||
if (nsContentUtils::IsOverridingWindowName(frameName)) {
|
||||
mPendingBrowsingContext->SetName(frameName);
|
||||
mBrowsingContext->SetName(frameName);
|
||||
}
|
||||
// Allow scripts to close the window if the browser specified so:
|
||||
if (mOwnerContent->AttrValueIs(kNameSpaceID_None,
|
||||
|
|
@ -2834,8 +2833,8 @@ nsresult nsFrameLoader::CreateStaticClone(nsFrameLoader* aDest) {
|
|||
aDest->mBrowsingContext->EnsureAttached();
|
||||
|
||||
// Ensure that the embedder element is set correctly.
|
||||
aDest->mPendingBrowsingContext->SetEmbedderElement(aDest->mOwnerContent);
|
||||
aDest->mPendingBrowsingContext->Embed();
|
||||
aDest->mBrowsingContext->SetEmbedderElement(aDest->mOwnerContent);
|
||||
aDest->mBrowsingContext->Embed();
|
||||
aDest->mStaticCloneOf = this;
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -3044,7 +3043,7 @@ void nsFrameLoader::InitializeFromBrowserParent(BrowserParent* aBrowserParent) {
|
|||
MOZ_ASSERT(!mRemoteBrowser);
|
||||
mIsRemoteFrame = true;
|
||||
mRemoteBrowser = new BrowserHost(aBrowserParent);
|
||||
mPendingBrowsingContext = aBrowserParent->GetBrowsingContext();
|
||||
mBrowsingContext = aBrowserParent->GetBrowsingContext();
|
||||
mChildID = aBrowserParent ? aBrowserParent->Manager()->ChildID() : 0;
|
||||
MaybeUpdatePrimaryBrowserParent(eBrowserParentChanged);
|
||||
ReallyLoadFrameScripts();
|
||||
|
|
@ -3082,9 +3081,7 @@ void nsFrameLoader::ApplySandboxFlags(uint32_t sandboxFlags) {
|
|||
sandboxFlags |= SANDBOXED_AUXILIARY_NAVIGATION;
|
||||
}
|
||||
}
|
||||
if (BrowsingContext* context = GetBrowsingContext()) {
|
||||
context->SetSandboxFlags(sandboxFlags);
|
||||
}
|
||||
mBrowsingContext->SetSandboxFlags(sandboxFlags);
|
||||
}
|
||||
|
||||
/* virtual */
|
||||
|
|
@ -3265,7 +3262,8 @@ already_AddRefed<nsILoadContext> nsFrameLoader::LoadContext() {
|
|||
return loadContext.forget();
|
||||
}
|
||||
|
||||
BrowsingContext* nsFrameLoader::GetBrowsingContext() {
|
||||
already_AddRefed<BrowsingContext> nsFrameLoader::GetBrowsingContext() {
|
||||
RefPtr<BrowsingContext> browsingContext;
|
||||
if (IsRemoteFrame()) {
|
||||
Unused << EnsureRemoteBrowser();
|
||||
} else if (mOwnerContent) {
|
||||
|
|
@ -3274,15 +3272,15 @@ BrowsingContext* nsFrameLoader::GetBrowsingContext() {
|
|||
return GetExtantBrowsingContext();
|
||||
}
|
||||
|
||||
BrowsingContext* nsFrameLoader::GetExtantBrowsingContext() {
|
||||
BrowsingContext* browsingContext = nullptr;
|
||||
already_AddRefed<BrowsingContext> nsFrameLoader::GetExtantBrowsingContext() {
|
||||
RefPtr<BrowsingContext> browsingContext;
|
||||
if (mRemoteBrowser) {
|
||||
browsingContext = mRemoteBrowser->GetBrowsingContext();
|
||||
} else if (mDocShell) {
|
||||
browsingContext = mDocShell->GetBrowsingContext();
|
||||
}
|
||||
MOZ_ASSERT_IF(browsingContext, browsingContext == mPendingBrowsingContext);
|
||||
return browsingContext;
|
||||
MOZ_ASSERT_IF(browsingContext, browsingContext == mBrowsingContext);
|
||||
return browsingContext.forget();
|
||||
}
|
||||
|
||||
void nsFrameLoader::InitializeBrowserAPI() {
|
||||
|
|
@ -3489,8 +3487,9 @@ void nsFrameLoader::SetWillChangeProcess() {
|
|||
// resilient. For the moment, though, the surrounding process switch code
|
||||
// is enough in flux that we're better off with a workable interim
|
||||
// solution.
|
||||
MOZ_DIAGNOSTIC_ASSERT(mPendingBrowsingContext == GetBrowsingContext());
|
||||
RefPtr<CanonicalBrowsingContext> bc(mPendingBrowsingContext->Canonical());
|
||||
MOZ_DIAGNOSTIC_ASSERT(mBrowsingContext ==
|
||||
RefPtr<BrowsingContext>(GetBrowsingContext()));
|
||||
RefPtr<CanonicalBrowsingContext> bc(mBrowsingContext->Canonical());
|
||||
bc->SetInFlightProcessId(browserParent->Manager()->ChildID());
|
||||
auto callback = [bc](auto) { bc->SetInFlightProcessId(0); };
|
||||
browserParent->SendWillChangeProcess(callback, callback);
|
||||
|
|
@ -3514,7 +3513,7 @@ void nsFrameLoader::MaybeNotifyCrashed(BrowsingContext* aBrowsingContext,
|
|||
return;
|
||||
}
|
||||
|
||||
if (mPendingBrowsingContext == aBrowsingContext) {
|
||||
if (mBrowsingContext == aBrowsingContext) {
|
||||
mTabProcessCrashFired = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -152,8 +152,8 @@ class nsFrameLoader final : public nsStubMutationObserver,
|
|||
|
||||
already_AddRefed<nsILoadContext> LoadContext();
|
||||
|
||||
mozilla::dom::BrowsingContext* GetBrowsingContext();
|
||||
mozilla::dom::BrowsingContext* GetExtantBrowsingContext();
|
||||
already_AddRefed<mozilla::dom::BrowsingContext> GetBrowsingContext();
|
||||
already_AddRefed<mozilla::dom::BrowsingContext> GetExtantBrowsingContext();
|
||||
|
||||
/**
|
||||
* Start loading the frame. This method figures out what to load
|
||||
|
|
@ -468,7 +468,7 @@ class nsFrameLoader final : public nsStubMutationObserver,
|
|||
|
||||
nsresult PopulateUserContextIdFromAttribute(mozilla::OriginAttributes& aAttr);
|
||||
|
||||
RefPtr<mozilla::dom::BrowsingContext> mPendingBrowsingContext;
|
||||
RefPtr<mozilla::dom::BrowsingContext> mBrowsingContext;
|
||||
nsCOMPtr<nsIURI> mURIToLoad;
|
||||
nsCOMPtr<nsIPrincipal> mTriggeringPrincipal;
|
||||
nsCOMPtr<nsIContentSecurityPolicy> mCsp;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ void nsFrameLoaderOwner::SetFrameLoader(nsFrameLoader* aNewFrameLoader) {
|
|||
mFrameLoader = aNewFrameLoader;
|
||||
}
|
||||
|
||||
mozilla::dom::BrowsingContext* nsFrameLoaderOwner::GetBrowsingContext() {
|
||||
already_AddRefed<mozilla::dom::BrowsingContext>
|
||||
nsFrameLoaderOwner::GetBrowsingContext() {
|
||||
if (mFrameLoader) {
|
||||
return mFrameLoader->GetBrowsingContext();
|
||||
}
|
||||
|
|
@ -205,7 +206,7 @@ void nsFrameLoaderOwner::ChangeRemotenessWithBridge(BrowserBridgeChild* aBridge,
|
|||
|
||||
std::function<void()> frameLoaderInit = [&] {
|
||||
RefPtr<BrowserBridgeHost> host = aBridge->FinishInit(mFrameLoader);
|
||||
mFrameLoader->mPendingBrowsingContext->SetEmbedderElement(
|
||||
mFrameLoader->mBrowsingContext->SetEmbedderElement(
|
||||
mFrameLoader->GetOwnerContent());
|
||||
mFrameLoader->mRemoteBrowser = host;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class nsFrameLoaderOwner : public nsISupports {
|
|||
already_AddRefed<nsFrameLoader> GetFrameLoader();
|
||||
void SetFrameLoader(nsFrameLoader* aNewFrameLoader);
|
||||
|
||||
mozilla::dom::BrowsingContext* GetBrowsingContext();
|
||||
already_AddRefed<mozilla::dom::BrowsingContext> GetBrowsingContext();
|
||||
|
||||
// Destroy (if it exists) and recreate our frameloader, based on new
|
||||
// remoteness requirements. This should follow the same path as
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче