Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1562264 - Propagate remote/fission flags from parent to child for content window.open() calls, r=kmag

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D40836

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kashav Madan 2019-08-23 16:06:09 +00:00
parent bf7dde4bf0
commit ea42e15279
4 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/ipc/ContentChild.cpp
View File

@ -2081,6 +2081,12 @@ already_AddRefed<RemoteBrowser> ContentChild::CreateBrowser(
if (loadContext && loadContext->UsePrivateBrowsing()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
}
if (loadContext && loadContext->UseRemoteTabs()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_REMOTE_WINDOW;
}
if (loadContext && loadContext->UseRemoteSubframes()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_FISSION_WINDOW;
}
if (docShell->GetAffectPrivateSessionLifetime()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_LIFETIME;
}

36
dom/ipc/ContentParent.cpp
View File

@ -1187,6 +1187,12 @@ already_AddRefed<RemoteBrowser> ContentParent::CreateBrowser(
if (loadContext && loadContext->UsePrivateBrowsing()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
}
if (loadContext && loadContext->UseRemoteTabs()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_REMOTE_WINDOW;
}
if (loadContext && loadContext->UseRemoteSubframes()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_FISSION_WINDOW;
}
if (docShell->GetAffectPrivateSessionLifetime()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_LIFETIME;
}
@ -3338,12 +3344,12 @@ mozilla::ipc::IPCResult ContentParent::RecvConstructPopupBrowser(
if (!loadContext) {
return IPC_FAIL(this, "Missing Opener LoadContext");
}
bool isPrivate;
loadContext->GetUsePrivateBrowsing(&isPrivate);
if (isPrivate) {
if (loadContext->UsePrivateBrowsing()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
}
if (loadContext->UseRemoteSubframes()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_FISSION_WINDOW;
}
}
// And because we're allocating a remote browser, of course the
@ -4696,11 +4702,10 @@ mozilla::ipc::IPCResult ContentParent::CommonCreateWindow(
{
// The content process should never be in charge of computing whether or
// not a window should be private or remote - the parent will do that.
// not a window should be private - the parent will do that.
const uint32_t badFlags = nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW |
nsIWebBrowserChrome::CHROME_NON_PRIVATE_WINDOW |
nsIWebBrowserChrome::CHROME_PRIVATE_LIFETIME |
nsIWebBrowserChrome::CHROME_REMOTE_WINDOW;
nsIWebBrowserChrome::CHROME_PRIVATE_LIFETIME;
if (!!(aChromeFlags & badFlags)) {
return IPC_FAIL(this, "Forbidden aChromeFlags passed");
}
@ -4709,6 +4714,23 @@ mozilla::ipc::IPCResult ContentParent::CommonCreateWindow(
BrowserHost* thisBrowserHost =
thisBrowserParent ? thisBrowserParent->GetBrowserHost() : nullptr;
MOZ_ASSERT(!thisBrowserParent == !thisBrowserHost);
// The content process should not have set its remote or fission flags if the
// parent doesn't also have these set.
if (thisBrowserHost) {
nsCOMPtr<nsILoadContext> context = thisBrowserHost->GetLoadContext();
// TODO: This failure condition is more relaxed than it should be, since
// there are some cases where the child process still fails to set the
// correct chrome flags. See bug 1576204.
if (((aChromeFlags & nsIWebBrowserChrome::CHROME_REMOTE_WINDOW) &&
!context->UseRemoteTabs()) ||
((aChromeFlags & nsIWebBrowserChrome::CHROME_FISSION_WINDOW) &&
!context->UseRemoteSubframes())) {
return IPC_FAIL(this, "Unexpected aChromeFlags passed");
}
}
nsCOMPtr<nsIContent> frame;
if (thisBrowserParent) {
frame = thisBrowserParent->GetOwnerElement();

15
toolkit/components/windowwatcher/nsWindowWatcher.cpp
View File

@ -691,6 +691,20 @@ nsresult nsWindowWatcher::OpenWindowInternal(
MOZ_ASSERT(XRE_IsParentProcess());
chromeFlags |= nsIWebBrowserChrome::CHROME_OPENAS_DIALOG;
}
// Propagate the remote & fission status of the parent window, if available,
// to the child.
if (parentWindow) {
auto* docShell = nsDocShell::Cast(parentWindow->GetDocShell());
if (docShell->UseRemoteTabs()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_REMOTE_WINDOW;
}
if (docShell->UseRemoteSubframes()) {
chromeFlags |= nsIWebBrowserChrome::CHROME_FISSION_WINDOW;
}
}
}
SizeSpec sizeSpec;
@ -2472,6 +2486,7 @@ int32_t nsWindowWatcher::GetWindowOpenLocation(nsPIDOMWindowOuter* aParent,
// which might have been automatically flipped by Gecko.
int32_t uiChromeFlags = aChromeFlags;
uiChromeFlags &= ~(nsIWebBrowserChrome::CHROME_REMOTE_WINDOW |
nsIWebBrowserChrome::CHROME_FISSION_WINDOW |
nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW |
nsIWebBrowserChrome::CHROME_NON_PRIVATE_WINDOW |
nsIWebBrowserChrome::CHROME_PRIVATE_LIFETIME);

14
toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
View File

@ -282,9 +282,17 @@ add_task(async function test_new_remote_window_flags() {
// as part of the BrowserChild, so we have to check those too.
let contentChromeFlags = await getContentChromeFlags(win);
assertContentFlags(contentChromeFlags);
Assert.ok(
!(contentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_REMOTE_WINDOW),
"Should not be remote in the content process."
Assert.equal(
parentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_REMOTE_WINDOW,
contentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_REMOTE_WINDOW,
"Should have matching remote value in parent and content"
);
Assert.equal(
parentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_FISSION_WINDOW,
contentChromeFlags & Ci.nsIWebBrowserChrome.CHROME_FISSION_WINDOW,
"Should have matching fission value in parent and content"
);
await BrowserTestUtils.closeWindow(win);