Synchronously raise window when window.focus() called in OOP iframe
Differential Revision: https://phabricator.services.mozilla.com/D96184
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1674743
gecko-commit: 17658a2394cf21d332184a5f78f8dec6637c8a4d
gecko-reviewers: hsivonen
diff --git a/focus/focus-restoration-in-different-site-iframes-window.html b/focus/focus-restoration-in-different-site-iframes-window.html
new file mode 100644
index 0000000..75c82ad
--- /dev/null
+++ b/focus/focus-restoration-in-different-site-iframes-window.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test focus restoration</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+ test(function() {
+ assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,", 'Check log');
+ }, "Check result");
+ w.close();
+ done();
+};
+var w = window.open("support/focus-restoration-in-different-site-iframes-outer-window.sub.html");
+</script>
diff --git a/focus/focus-restoration-in-different-site-iframes.html b/focus/focus-restoration-in-different-site-iframes.html
index 3de0545..3861347 100644
--- a/focus/focus-restoration-in-different-site-iframes.html
+++ b/focus/focus-restoration-in-different-site-iframes.html
@@ -7,7 +7,7 @@
setup({explicit_done:true});
window.onmessage = function(e) {
test(function() {
- assert_equals(e.data, "outerlog:log:bodyfocus,inputfocus,inputblur,bodyblur,bodyfocus,inputfocus,", 'Check log');
+ assert_equals(e.data, "outerlog:log:willfocusinput,bodyfocus,inputfocus,didfocusinput,inputblur,bodyblur,bodyfocus,inputfocus,", 'Check log');
}, "Check result");
w.close();
done();
diff --git a/focus/focus-restoration-in-same-site-iframes-window.html b/focus/focus-restoration-in-same-site-iframes-window.html
new file mode 100644
index 0000000..fe015fb
--- /dev/null
+++ b/focus/focus-restoration-in-same-site-iframes-window.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test focus restoration</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+ test(function() {
+ assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,", 'Check log');
+ }, "Check result");
+ w.close();
+ done();
+};
+var w = window.open("support/focus-restoration-in-same-site-iframes-outer-window.html");
+</script>
diff --git a/focus/support/focus-restoration-in-different-site-iframes-inner-window.html b/focus/support/focus-restoration-in-different-site-iframes-inner-window.html
new file mode 100644
index 0000000..d1bcc85
--- /dev/null
+++ b/focus/support/focus-restoration-in-different-site-iframes-inner-window.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Inner document</title>
+</head>
+<body>
+<h1>Inner</h1>
+<script>
+let log = "log:";
+window.onfocus = function() {
+ log += "windowfocus,"
+}
+window.onblur = function() {
+ log += "windowblur,"
+}
+window.onload = function() {
+ log += "willfocuswindow,"
+ window.focus();
+ log += "didfocuswindow,"
+ parent.postMessage(log, "*");
+}
+</script>
+</body>
+</html>
diff --git a/focus/support/focus-restoration-in-different-site-iframes-inner.html b/focus/support/focus-restoration-in-different-site-iframes-inner.html
index 903b0c0..d076579 100644
--- a/focus/support/focus-restoration-in-different-site-iframes-inner.html
+++ b/focus/support/focus-restoration-in-different-site-iframes-inner.html
@@ -29,7 +29,9 @@
log += "bodyblur,"
}
window.onload = function() {
+ log += "willfocusinput,"
input.focus();
+ log += "didfocusinput,"
parent.postMessage("start", "*");
}
</script>
diff --git a/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html b/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html
new file mode 100644
index 0000000..e2b6d61
--- /dev/null
+++ b/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus restoration outer</title>
+<script>
+let other = null;
+let log = "outerlog:";
+function getLog() {
+ return log;
+}
+window.onmessage = function(e) {
+ opener.postMessage(getLog() + e.data, "*");
+};
+window.onload = function() {
+ document.getElementsByTagName("iframe")[0].onfocus = function() {
+ log += "iframefocus,";
+ }
+ document.getElementsByTagName("iframe")[0].onblur = function() {
+ log += "iframeblur,";
+ }
+ document.body.onfocus = function() {
+ log += "bodyfocus,";
+ }
+ document.body.onblur = function() {
+ log += "bodyblur,";
+ }
+}
+</script>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/focus-restoration-in-different-site-iframes-inner-window.html">
diff --git a/focus/support/focus-restoration-in-same-site-iframes-inner-window.html b/focus/support/focus-restoration-in-same-site-iframes-inner-window.html
new file mode 100644
index 0000000..d1bcc85
--- /dev/null
+++ b/focus/support/focus-restoration-in-same-site-iframes-inner-window.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Inner document</title>
+</head>
+<body>
+<h1>Inner</h1>
+<script>
+let log = "log:";
+window.onfocus = function() {
+ log += "windowfocus,"
+}
+window.onblur = function() {
+ log += "windowblur,"
+}
+window.onload = function() {
+ log += "willfocuswindow,"
+ window.focus();
+ log += "didfocuswindow,"
+ parent.postMessage(log, "*");
+}
+</script>
+</body>
+</html>
diff --git a/focus/support/focus-restoration-in-same-site-iframes-outer-window.html b/focus/support/focus-restoration-in-same-site-iframes-outer-window.html
new file mode 100644
index 0000000..2c2cb74
--- /dev/null
+++ b/focus/support/focus-restoration-in-same-site-iframes-outer-window.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus restoration outer</title>
+<script>
+let other = null;
+let log = "outerlog:";
+function getLog() {
+ return log;
+}
+window.onmessage = function(e) {
+ opener.postMessage(getLog() + e.data, "*");
+};
+window.onload = function() {
+ document.getElementsByTagName("iframe")[0].onfocus = function() {
+ log += "iframefocus,";
+ }
+ document.getElementsByTagName("iframe")[0].onblur = function() {
+ log += "iframeblur,";
+ }
+ document.body.onfocus = function() {
+ log += "bodyfocus,";
+ }
+ document.body.onblur = function() {
+ log += "bodyblur,";
+ }
+}
+</script>
+<iframe src="focus-restoration-in-same-site-iframes-inner-window.html">
