corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1716762 - Don't allow focus to move to remote iframe which is display: none; r=emilio

Browse Source 
Make it behave the same as in-process iframe.

Differential Revision: https://phabricator.services.mozilla.com/D118002
This commit is contained in:
Edgar Chen
2021-07-07 12:08:18 +00:00
parent 8167a5920d
commit c8e0351b70
8 changed files with 183 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDocShell.cpp
View File

@@ -7990,6 +7990,7 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
} }
nscolor bgcolor = NS_RGBA(0, 0, 0, 0); nscolor bgcolor = NS_RGBA(0, 0, 0, 0);
bool isUnderHiddenEmbedderElement = false;
// Ensure that the content viewer is destroyed *after* the GC - bug 71515 // Ensure that the content viewer is destroyed *after* the GC - bug 71515
nsCOMPtr<nsIContentViewer> contentViewer = mContentViewer; nsCOMPtr<nsIContentViewer> contentViewer = mContentViewer;
if (contentViewer) { if (contentViewer) {
@@ -8001,6 +8002,7 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
// presentation shell, so we can use it for the next document. // presentation shell, so we can use it for the next document.
if (PresShell* presShell = contentViewer->GetPresShell()) { if (PresShell* presShell = contentViewer->GetPresShell()) {
bgcolor = presShell->GetCanvasBackground(); bgcolor = presShell->GetCanvasBackground();
isUnderHiddenEmbedderElement = presShell->IsUnderHiddenEmbedderElement();
} }
contentViewer->Close(mSavingOldViewer ? mOSHE.get() : nullptr); contentViewer->Close(mSavingOldViewer ? mOSHE.get() : nullptr);
@@ -8046,6 +8048,9 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
if (RefPtr<PresShell> presShell = mContentViewer->GetPresShell()) { if (RefPtr<PresShell> presShell = mContentViewer->GetPresShell()) {
presShell->SetCanvasBackground(bgcolor); presShell->SetCanvasBackground(bgcolor);
presShell->ActivenessMaybeChanged(); presShell->ActivenessMaybeChanged();
if (isUnderHiddenEmbedderElement) {
presShell->SetIsUnderHiddenEmbedderElement(isUnderHiddenEmbedderElement);
}
} }
// XXX: It looks like the LayoutState gets restored again in Embed() // XXX: It looks like the LayoutState gets restored again in Embed()

19
dom/base/nsFrameLoader.cpp
View File

@@ -2473,6 +2473,25 @@ void nsFrameLoader::SendIsUnderHiddenEmbedderElement(
} }
} }
void nsFrameLoader::PropagateIsUnderHiddenEmbedderElement(
bool aIsUnderHiddenEmbedderElement) {
bool isUnderHiddenEmbedderElement = true;
if (Document* ownerDoc = GetOwnerDoc()) {
if (PresShell* presShell = ownerDoc->GetPresShell()) {
isUnderHiddenEmbedderElement = presShell->IsUnderHiddenEmbedderElement();
}
}
isUnderHiddenEmbedderElement |= aIsUnderHiddenEmbedderElement;
if (nsDocShell* docShell = GetExistingDocShell()) {
if (PresShell* presShell = docShell->GetPresShell()) {
presShell->SetIsUnderHiddenEmbedderElement(isUnderHiddenEmbedderElement);
}
} else {
SendIsUnderHiddenEmbedderElement(isUnderHiddenEmbedderElement);
}
}
void nsFrameLoader::UpdateBaseWindowPositionAndSize( void nsFrameLoader::UpdateBaseWindowPositionAndSize(
nsSubDocumentFrame* aIFrame) { nsSubDocumentFrame* aIFrame) {
nsCOMPtr<nsIBaseWindow> baseWindow = GetDocShell(IgnoreErrors()); nsCOMPtr<nsIBaseWindow> baseWindow = GetDocShell(IgnoreErrors());

2
dom/base/nsFrameLoader.h
View File

@@ -144,6 +144,8 @@ class nsFrameLoader final : public nsStubMutationObserver,
} }
nsresult UpdatePositionAndSize(nsSubDocumentFrame* aIFrame); nsresult UpdatePositionAndSize(nsSubDocumentFrame* aIFrame);
void SendIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement); void SendIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement);
void PropagateIsUnderHiddenEmbedderElement(
bool aIsUnderHiddenEmbedderElement);
// When creating a nsFrameLoaderOwner which is a static clone, a // When creating a nsFrameLoaderOwner which is a static clone, a
// `nsFrameLoader` is not immediately attached to it. Instead, it is added to // `nsFrameLoader` is not immediately attached to it. Instead, it is added to

4
dom/base/nsFrameLoaderOwner.cpp
View File

@@ -213,6 +213,10 @@ void nsFrameLoaderOwner::ChangeFrameLoaderCommon(Element* aOwner) {
mozilla::ChromeOnlyDispatch::eYes)) mozilla::ChromeOnlyDispatch::eYes))
->RunDOMEventWhenSafe(); ->RunDOMEventWhenSafe();
} }
mFrameLoader->PropagateIsUnderHiddenEmbedderElement(
!aOwner->GetPrimaryFrame() ||
!aOwner->GetPrimaryFrame()->StyleVisibility()->IsVisible());
} }
void nsFrameLoaderOwner::ChangeRemoteness( void nsFrameLoaderOwner::ChangeRemoteness(

15
dom/base/test/file_focus_display_none_xorigin_iframe_inner.html Normal file
View File

@@ -0,0 +1,15 @@
<!DOCTYPE html>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<h2>Inner</h2>
<input></input><br>
<script type="text/javascript">
let input = document.querySelector("input");
window.onmessage = function(e) {
info(`inner received message: ${e.data}`);
if (e.data === "focus") {
input.focus();
window.parent.postMessage("done", "*");
}
};
</script>

3
dom/base/test/mochitest.ini
View File

@@ -669,6 +669,9 @@ skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_focus_design_mode.html] [test_focus_design_mode.html]
support-files = support-files =
file_focus_design_mode_inner.html file_focus_design_mode_inner.html
[test_focus_display_none_xorigin_iframe.html]
support-files =
file_focus_display_none_xorigin_iframe_inner.html
[test_getAttribute_after_createAttribute.html] [test_getAttribute_after_createAttribute.html]
[test_getElementById.html] [test_getElementById.html]
[test_getTranslationNodes.html] [test_getTranslationNodes.html]

134
dom/base/test/test_focus_display_none_xorigin_iframe.html Normal file
View File

@@ -0,0 +1,134 @@
<!DOCTYPE html>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1716762
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1716762</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1716762">Mozilla Bug 1716762</a><br>
<input></input><br>
<div id="target" style="display: none;">
<iframe src="http://example.org/tests/dom/base/test/file_focus_display_none_xorigin_iframe_inner.html"></iframe>
</div>
<script type="text/javascript">
let waitForMessage = function(aMsg) {
return new Promise(reslove => {
window.addEventListener("message", function handler(e) {
info(`main received message: ${e.data}`);
if (e.data === aMsg) {
window.removeEventListener("message", handler);
reslove();
}
});
});
};
let sendMessage = async function(aWindow, aMsg) {
aWindow.postMessage(aMsg, "*");
await waitForMessage("done");
}
let getFocus = function(aWindow) {
return new Promise(reslove => {
window.addEventListener("message", function handler(e) {
info(e.data);
reslove(e.data);
}, { once: true });
aWindow.postMessage("getfocus", "*");
});
}
/** Test for Bug 1716762 **/
let input = document.querySelector("input");
let iframe = document.querySelector("iframe");
add_task(async function test_ancestor_display_none_init() {
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "INPUT", "focus should stay on input element");
});
add_task(async function test_remove_ancestor_display_none() {
// remove `display: none` from the ancestor of iframe
document.getElementById("target").style = "";
document.body.offsetWidth;
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "IFRAME", "focus should move to iframe element");
});
add_task(async function test_ancestor_display_none() {
// add `display: none` to the ancestor of iframe back
document.getElementById("target").style = "display: none;";
document.body.offsetWidth;
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "INPUT", "focus should stay on input element");
});
add_task(async function test_remove_ancestor_display_none_again() {
// remove `display: none` from the ancestor of iframe
document.getElementById("target").style = "";
document.body.offsetWidth;
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "IFRAME", "focus should move to iframe element");
});
add_task(async function test_iframe_display_none() {
// add `display: none` to iframe
iframe.style = "display: none;";
document.body.offsetWidth;
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "INPUT", "focus should stay on input element");
});
add_task(async function test_remove_iframe_display_none() {
// remove `display: none` from iframe
iframe.style = "";
document.body.offsetWidth;
// focus input element
input.focus();
is(document.activeElement.tagName, "INPUT", "focus should move to input element");
// focus input element in hidden iframe
await sendMessage(iframe.contentWindow, "focus");
is(document.activeElement.tagName, "IFRAME", "focus should move to iframe element");
});
</script>
</body>
</html>

1
layout/generic/nsSubDocumentFrame.cpp
View File

@@ -895,6 +895,7 @@ static nsView* BeginSwapDocShellsForViews(nsView* aSibling);
void nsSubDocumentFrame::DestroyFrom(nsIFrame* aDestructRoot, void nsSubDocumentFrame::DestroyFrom(nsIFrame* aDestructRoot,
PostDestroyData& aPostDestroyData) { PostDestroyData& aPostDestroyData) {
PropagateIsUnderHiddenEmbedderElementToSubView(true);
if (mPostedReflowCallback) { if (mPostedReflowCallback) {
PresShell()->CancelReflowCallback(this); PresShell()->CancelReflowCallback(this);
mPostedReflowCallback = false; mPostedReflowCallback = false;