Skip to content

Commit

Permalink
Annevk review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
yoavweiss committed Mar 12, 2019
1 parent f96af7f commit 4bbc152
Show file tree
Hide file tree
Showing 18 changed files with 153 additions and 284 deletions.
3 changes: 1 addition & 2 deletions lint.whitelist
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ SET TIMEOUT: paint-timing/resources/subframe-painting.html
SET TIMEOUT: payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html
SET TIMEOUT: preload/single-download-preload.html
SET TIMEOUT: resize-observer/resources/iframe.html
SET TIMEOUT: resource-timing/resources/*-reload-back.sub.html
SET TIMEOUT: resource-timing/resources/*-navigate-back.html
SET TIMEOUT: resource-timing/resources/nested-contexts.js
SET TIMEOUT: screen-orientation/onchange-event.html
SET TIMEOUT: secure-contexts/basic-popup-and-iframe-tests.https.js
SET TIMEOUT: service-workers/cache-storage/script-tests/cache-abort.js
Expand Down
12 changes: 6 additions & 6 deletions resource-timing/embed-navigate-back.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
let t = async_test("Test that embed navigates are not observable by the parent, even after history navigations");
window.open("resources/embed-navigate-back.html");
addEventListener("message", t.step_func(e => {
assert_equals(e.data, "PASS");
t.done();
}));
async_test(t => {
window.open("resources/embed-navigate-back.html");
addEventListener("message", t.step_func_done(e => {
assert_equals(e.data, "PASS");
}));
}, "Test that embed navigates are not observable by the parent, even after history navigations");
</script>

21 changes: 2 additions & 19 deletions resource-timing/embed-navigate.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,10 @@
<title>Resource Timing embed navigate</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that HTML embed navigates are not observable by the parent");
const pre_navigate_url = new URL("resources/document-that-navigates.html", location).href;
const post_navigate_url = new URL("resources/document-navigated.html", location).href;
function verify_embed_navigate_not_observable() {
let entries = performance.getEntriesByType("resource");
let found_first_embed = false;
for (entry of entries) {
if (entry.name == pre_navigate_url) {
found_first_embed = true;
}
assert_not_equals(entry.name, post_navigate_url, "Navigated embed should not be observable");
}
assert_true(found_first_embed, "Initial embed should be observable");
t.done();
}
window.addEventListener("message", t.step_func(e=>{
if (e.data == "navigated") {
verify_embed_navigate_not_observable();
}
}));
setup_navigate_test(t);
</script>
<embed type="text/html">
<script>
Expand Down
21 changes: 2 additions & 19 deletions resource-timing/embed-refresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,10 @@
<title>Resource Timing embed refresh</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that an HTML embed refreshes are not observable by the parent");
const pre_refresh_url = new URL("resources/document-that-refreshes.html", location).href;
const post_refresh_url = new URL("resources/document-refreshed.html", location).href;
function verify_embed_refresh_not_observable() {
let entries = performance.getEntriesByType("resource");
let found_first_embed = false;
for (entry of entries) {
if (entry.name == pre_refresh_url) {
found_first_embed = true;
}
assert_not_equals(entry.name, post_refresh_url, "Refreshed embed should not be observable");
}
assert_true(found_first_embed, "Initial embed should be observable");
t.done();
}
window.addEventListener("message", t.step_func(e=>{
if (e.data == "refreshed") {
verify_embed_refresh_not_observable();
}
}));
setup_refresh_test(t);
</script>
<embed type="text/html">
<script>
Expand Down
16 changes: 16 additions & 0 deletions resource-timing/iframe-navigate-back.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Resource Timing iframe navigate - back button navigation</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(t => {
window.open("resources/iframe-navigate-back.html");
addEventListener("message", t.step_func_done(e => {
assert_equals(e.data, "PASS");
}));
}, "Test that iframe navigations are not observable by the parent, even after history navigations");
</script>

16 changes: 16 additions & 0 deletions resource-timing/iframe-navigate.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Resource Timing iframe navigate</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that iframe navigates are not observable by the parent");
setup_navigate_test(t);
</script>
<iframe></iframe>
<script>
document.getElementsByTagName("iframe")[0].src = pre_navigate_url;
</script>
21 changes: 2 additions & 19 deletions resource-timing/iframe-refresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,10 @@
<title>Resource Timing iframe refresh</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that iframe refreshes are not observable by the parent");
const pre_refresh_url = new URL("resources/document-that-refreshes.html", location).href;
const post_refresh_url = new URL("resources/document-refreshed.html", location).href;
function verify_iframe_refresh_not_observable() {
let entries = performance.getEntriesByType("resource");
let found_first_iframe = false;
for (entry of entries) {
if (entry.name == pre_refresh_url) {
found_first_iframe = true;
}
assert_not_equals(entry.name, post_refresh_url, "Refreshed iframe should not be observable");
}
assert_true(found_first_iframe, "Initial iframe should be observable");
t.done();
}
window.addEventListener("message", t.step_func(e=>{
if (e.data == "refreshed") {
verify_iframe_refresh_not_observable();
}
}));
setup_refresh_test(t);
</script>
<iframe></iframe>
<script>
Expand Down
16 changes: 0 additions & 16 deletions resource-timing/iframe-reload-back.html

This file was deleted.

33 changes: 0 additions & 33 deletions resource-timing/iframe-reload.html

This file was deleted.

16 changes: 16 additions & 0 deletions resource-timing/object-navigate-back.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Resource Timing object navigate - back button navigation</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(t => {
window.open("resources/object-navigate-back.html");
addEventListener("message", t.step_func_done(e => {
assert_equals(e.data, "PASS");
}));
}, "Test that object navigations are not observable by the parent, even after history navigations");
</script>

16 changes: 16 additions & 0 deletions resource-timing/object-navigate.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Resource Timing object navigate</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that object navigates are not observable by the parent");
setup_navigate_test(t);
</script>
<object></object>
<script>
document.getElementsByTagName("object")[0].data = pre_navigate_url;
</script>
21 changes: 2 additions & 19 deletions resource-timing/object-refresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,10 @@
<title>Resource Timing object refresh</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/nested-contexts.js"></script>
<script>
let t = async_test("Test that object refreshes are not observable by the parent");
const pre_refresh_url = new URL("resources/document-that-refreshes.html", location).href;
const post_refresh_url = new URL("resources/document-refreshed.html", location).href;
function verify_object_refresh_not_observable() {
let entries = performance.getEntriesByType("resource");
let found_first_object = false;
for (entry of entries) {
if (entry.name == pre_refresh_url) {
found_first_object = true;
}
assert_not_equals(entry.name, post_refresh_url, "Refreshed object should not be observable");
}
assert_true(found_first_object, "Initial object should be observable");
t.done();
}
window.addEventListener("message", t.step_func(e=>{
if (e.data == "refreshed") {
verify_object_refresh_not_observable();
}
}));
setup_refresh_test(t);
</script>
<object></object>
<script>
Expand Down
16 changes: 0 additions & 16 deletions resource-timing/object-reload-back.html

This file was deleted.

33 changes: 0 additions & 33 deletions resource-timing/object-reload.html

This file was deleted.

36 changes: 2 additions & 34 deletions resource-timing/resources/embed-navigate-back.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,9 @@
<head>
<meta charset="utf-8" />
<title>Resource Timing embed navigate - back button navigation</title>
<script src="nested-contexts.js"></script>
<script>
const pre_navigate_url = new URL("document-that-navigates.html", location).href;
const post_navigate_url = new URL("document-navigated.html", location).href;
function verify_embed_navigate_not_observable() {
let entries = performance.getEntriesByType("resource");
let found_first_embed = false;
for (entry of entries) {
if (entry.name == pre_navigate_url) {
found_first_embed = true;
}
if (entry.name == post_navigate_url) {
opener.postMessage("FAIL - navigated embed exposed", "*");
return;
}
}
if (!found_first_embed) {
opener.postMessage("FAIL - first embed not exposed", "*");
return;
}
opener.postMessage("PASS", "*");
}
window.addEventListener("message", e=>{
if (e.data == "navigated") {
if (sessionStorage.navigated) {
delete sessionStorage.navigated;
verify_embed_navigate_not_observable();
} else {
sessionStorage.navigated = true;
setTimeout(() => {
history.pushState({}, "", "embed-navigate-back.html");
location.href="navigate_back.html";
}, 0);
}
}
});
setup_back_navigation("embed-navigate-back.html");
</script>
<embed type="text/html">
<script>
Expand Down
Loading

0 comments on commit 4bbc152

Please sign in to comment.