From a9d38f652781c6c67084ef26eb6e40627b011d62 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Wed, 31 Oct 2018 16:06:49 +0100 Subject: [PATCH 01/13] Add nested-context resource-timing tests --- resource-timing/embed-refresh.sub.html | 28 +++++++++++++ resource-timing/embed-reload-back.html | 16 ++++++++ resource-timing/embed-reload.sub.html | 28 +++++++++++++ resource-timing/iframe-refresh.sub.html | 28 +++++++++++++ resource-timing/iframe-reload-back.html | 16 ++++++++ resource-timing/iframe-reload.sub.html | 28 +++++++++++++ resource-timing/object-refresh.sub.html | 28 +++++++++++++ resource-timing/object-reload-back.html | 16 ++++++++ resource-timing/object-reload.sub.html | 28 +++++++++++++ .../resources/embed-reload-back.sub.html | 41 +++++++++++++++++++ .../resources/iframe-refreshed.html | 11 +++++ .../resources/iframe-reload-back.sub.html | 41 +++++++++++++++++++ .../resources/iframe-reloaded.html | 11 +++++ .../resources/iframe-that-refreshes.html | 8 ++++ .../resources/iframe-that-reloads.html | 11 +++++ resource-timing/resources/navigate_back.html | 7 ++++ .../resources/object-reload-back.sub.html | 41 +++++++++++++++++++ 17 files changed, 387 insertions(+) create mode 100644 resource-timing/embed-refresh.sub.html create mode 100644 resource-timing/embed-reload-back.html create mode 100644 resource-timing/embed-reload.sub.html create mode 100644 resource-timing/iframe-refresh.sub.html create mode 100644 resource-timing/iframe-reload-back.html create mode 100644 resource-timing/iframe-reload.sub.html create mode 100644 resource-timing/object-refresh.sub.html create mode 100644 resource-timing/object-reload-back.html create mode 100644 resource-timing/object-reload.sub.html create mode 100644 resource-timing/resources/embed-reload-back.sub.html create mode 100644 resource-timing/resources/iframe-refreshed.html create mode 100644 resource-timing/resources/iframe-reload-back.sub.html create mode 100644 resource-timing/resources/iframe-reloaded.html create mode 100644 resource-timing/resources/iframe-that-refreshes.html create mode 100644 resource-timing/resources/iframe-that-reloads.html create mode 100644 resource-timing/resources/navigate_back.html create mode 100644 resource-timing/resources/object-reload-back.sub.html diff --git a/resource-timing/embed-refresh.sub.html b/resource-timing/embed-refresh.sub.html new file mode 100644 index 00000000000000..cd4857de31d2ae --- /dev/null +++ b/resource-timing/embed-refresh.sub.html @@ -0,0 +1,28 @@ + + + + +Resource Timing embed refresh + + + + diff --git a/resource-timing/embed-reload-back.html b/resource-timing/embed-reload-back.html new file mode 100644 index 00000000000000..7e7cb204b370fc --- /dev/null +++ b/resource-timing/embed-reload-back.html @@ -0,0 +1,16 @@ + + + + +Resource Timing embed reload - back button navigation + + + + diff --git a/resource-timing/embed-reload.sub.html b/resource-timing/embed-reload.sub.html new file mode 100644 index 00000000000000..74cdfc594dda77 --- /dev/null +++ b/resource-timing/embed-reload.sub.html @@ -0,0 +1,28 @@ + + + + +Resource Timing embed reload + + + + diff --git a/resource-timing/iframe-refresh.sub.html b/resource-timing/iframe-refresh.sub.html new file mode 100644 index 00000000000000..ceefc8311d3173 --- /dev/null +++ b/resource-timing/iframe-refresh.sub.html @@ -0,0 +1,28 @@ + + + + +Resource Timing iframe refresh + + + + + diff --git a/resource-timing/resources/object-reload-back.sub.html b/resource-timing/resources/object-reload-back.html similarity index 73% rename from resource-timing/resources/object-reload-back.sub.html rename to resource-timing/resources/object-reload-back.html index da30b906612884..6e31f5f41b33b8 100644 --- a/resource-timing/resources/object-reload-back.sub.html +++ b/resource-timing/resources/object-reload-back.html @@ -4,14 +4,16 @@ Resource Timing object reload - back button navigation - + + From 760b9d3253b1fc62a68899e9d241cd2f9aebc000 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Fri, 2 Nov 2018 22:14:19 +0100 Subject: [PATCH 05/13] review comments --- resource-timing/embed-refresh.html | 21 +++++++++++++-------- resource-timing/embed-reload-back.html | 4 ++-- resource-timing/embed-reload.html | 21 +++++++++++++-------- resource-timing/iframe-refresh.html | 11 ++++++++--- resource-timing/iframe-reload-back.html | 2 +- resource-timing/iframe-reload.html | 11 ++++++++--- resource-timing/object-refresh.html | 21 +++++++++++++-------- resource-timing/object-reload-back.html | 2 +- resource-timing/object-reload.html | 21 +++++++++++++-------- 9 files changed, 72 insertions(+), 42 deletions(-) diff --git a/resource-timing/embed-refresh.html b/resource-timing/embed-refresh.html index cd4857de31d2ae..2a69bf6155bdb7 100644 --- a/resource-timing/embed-refresh.html +++ b/resource-timing/embed-refresh.html @@ -7,22 +7,27 @@ - + + diff --git a/resource-timing/embed-reload-back.html b/resource-timing/embed-reload-back.html index f46c2eaaeffec2..87ca6672fabd81 100644 --- a/resource-timing/embed-reload-back.html +++ b/resource-timing/embed-reload-back.html @@ -6,8 +6,8 @@ - + + diff --git a/resource-timing/iframe-refresh.html b/resource-timing/iframe-refresh.html index ceefc8311d3173..2154aaffb220a9 100644 --- a/resource-timing/iframe-refresh.html +++ b/resource-timing/iframe-refresh.html @@ -7,14 +7,16 @@ - + diff --git a/resource-timing/iframe-reload-back.html b/resource-timing/iframe-reload-back.html index ddf75a1c97dbd8..be6e6fac6e22b2 100644 --- a/resource-timing/iframe-reload-back.html +++ b/resource-timing/iframe-reload-back.html @@ -7,7 +7,7 @@ - + diff --git a/resource-timing/object-refresh.html b/resource-timing/object-refresh.html index a51382f839d3a4..2535412155252f 100644 --- a/resource-timing/object-refresh.html +++ b/resource-timing/object-refresh.html @@ -7,22 +7,27 @@ - + + diff --git a/resource-timing/object-reload-back.html b/resource-timing/object-reload-back.html index 7c91d25f15a26c..d1f296b2b6520f 100644 --- a/resource-timing/object-reload-back.html +++ b/resource-timing/object-reload-back.html @@ -7,7 +7,7 @@ - + + From 2abb55d8eb3fcae3e4f3ee3117cdef21315165c2 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Tue, 6 Nov 2018 09:23:23 +0100 Subject: [PATCH 06/13] s/reload/navigate/ --- ...oad-back.html => embed-navigate-back.html} | 6 ++-- resource-timing/embed-navigate.html | 33 +++++++++++++++++++ resource-timing/embed-reload.html | 33 ------------------- resource-timing/iframe-reload-back.html | 6 ++-- resource-timing/iframe-reload.html | 20 +++++------ resource-timing/object-reload-back.html | 6 ++-- resource-timing/object-reload.html | 20 +++++------ ...-reloaded.html => document-navigated.html} | 4 +-- ...oads.html => document-that-navigates.html} | 2 +- ...oad-back.html => embed-navigate-back.html} | 22 ++++++------- ...ad-back.html => iframe-navigate-back.html} | 22 ++++++------- ...ad-back.html => object-navigate-back.html} | 22 ++++++------- 12 files changed, 98 insertions(+), 98 deletions(-) rename resource-timing/{embed-reload-back.html => embed-navigate-back.html} (54%) create mode 100644 resource-timing/embed-navigate.html delete mode 100644 resource-timing/embed-reload.html rename resource-timing/resources/{document-reloaded.html => document-navigated.html} (62%) rename resource-timing/resources/{document-that-reloads.html => document-that-navigates.html} (70%) rename resource-timing/resources/{embed-reload-back.html => embed-navigate-back.html} (56%) rename resource-timing/resources/{iframe-reload-back.html => iframe-navigate-back.html} (56%) rename resource-timing/resources/{object-reload-back.html => object-navigate-back.html} (56%) diff --git a/resource-timing/embed-reload-back.html b/resource-timing/embed-navigate-back.html similarity index 54% rename from resource-timing/embed-reload-back.html rename to resource-timing/embed-navigate-back.html index 87ca6672fabd81..83bd8a95c5ee50 100644 --- a/resource-timing/embed-reload-back.html +++ b/resource-timing/embed-navigate-back.html @@ -2,12 +2,12 @@ -Resource Timing embed reload - back button navigation +Resource Timing embed navigate - back button navigation + + + + diff --git a/resource-timing/embed-reload.html b/resource-timing/embed-reload.html deleted file mode 100644 index f17102403c65c1..00000000000000 --- a/resource-timing/embed-reload.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - -Resource Timing embed reload - - - - - diff --git a/resource-timing/iframe-reload-back.html b/resource-timing/iframe-reload-back.html index be6e6fac6e22b2..0fe4331a4bbdb4 100644 --- a/resource-timing/iframe-reload-back.html +++ b/resource-timing/iframe-reload-back.html @@ -2,12 +2,12 @@ -Resource Timing iframe reload - back button navigation +Resource Timing iframe navigate - back button navigation diff --git a/resource-timing/object-reload-back.html b/resource-timing/object-reload-back.html index d1f296b2b6520f..53fb3c0be91548 100644 --- a/resource-timing/object-reload-back.html +++ b/resource-timing/object-reload-back.html @@ -2,12 +2,12 @@ -Resource Timing object reload - back button navigation +Resource Timing object navigate - back button navigation diff --git a/resource-timing/resources/document-reloaded.html b/resource-timing/resources/document-navigated.html similarity index 62% rename from resource-timing/resources/document-reloaded.html rename to resource-timing/resources/document-navigated.html index e613f5560469db..fa87355c3ed18f 100644 --- a/resource-timing/resources/document-reloaded.html +++ b/resource-timing/resources/document-navigated.html @@ -4,9 +4,9 @@ - Reloaded document! + navigated document! diff --git a/resource-timing/resources/document-that-reloads.html b/resource-timing/resources/document-that-navigates.html similarity index 70% rename from resource-timing/resources/document-that-reloads.html rename to resource-timing/resources/document-that-navigates.html index 1ff0deecaddd23..cb567bf3d2ad12 100644 --- a/resource-timing/resources/document-that-reloads.html +++ b/resource-timing/resources/document-that-navigates.html @@ -5,7 +5,7 @@ diff --git a/resource-timing/resources/embed-reload-back.html b/resource-timing/resources/embed-navigate-back.html similarity index 56% rename from resource-timing/resources/embed-reload-back.html rename to resource-timing/resources/embed-navigate-back.html index 71f5410db6e148..bc4f7a56a1f344 100644 --- a/resource-timing/resources/embed-reload-back.html +++ b/resource-timing/resources/embed-navigate-back.html @@ -2,19 +2,19 @@ -Resource Timing embed reload - back button navigation +Resource Timing embed navigate - back button navigation diff --git a/resource-timing/resources/iframe-reload-back.html b/resource-timing/resources/iframe-navigate-back.html similarity index 56% rename from resource-timing/resources/iframe-reload-back.html rename to resource-timing/resources/iframe-navigate-back.html index 363c4c6a6a53b3..b8bd9ad31beb30 100644 --- a/resource-timing/resources/iframe-reload-back.html +++ b/resource-timing/resources/iframe-navigate-back.html @@ -2,19 +2,19 @@ -Resource Timing iframe reload - back button navigation +Resource Timing iframe navigate - back button navigation diff --git a/resource-timing/resources/object-reload-back.html b/resource-timing/resources/object-navigate-back.html similarity index 56% rename from resource-timing/resources/object-reload-back.html rename to resource-timing/resources/object-navigate-back.html index 6e31f5f41b33b8..9b961d57ac8c08 100644 --- a/resource-timing/resources/object-reload-back.html +++ b/resource-timing/resources/object-navigate-back.html @@ -2,19 +2,19 @@ -Resource Timing object reload - back button navigation +Resource Timing object navigate - back button navigation From 06075fbca143262636532fd5b3c51dd42b216f35 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Tue, 12 Mar 2019 16:51:36 +0100 Subject: [PATCH 07/13] Annevk review comments --- lint.whitelist | 1 + resource-timing/embed-navigate-back.html | 12 ++-- resource-timing/embed-navigate.html | 21 +----- resource-timing/embed-refresh.html | 21 +----- resource-timing/iframe-navigate-back.html | 16 +++++ resource-timing/iframe-navigate.html | 16 +++++ resource-timing/iframe-refresh.html | 21 +----- resource-timing/iframe-reload-back.html | 16 ----- resource-timing/iframe-reload.html | 33 --------- resource-timing/object-navigate-back.html | 16 +++++ resource-timing/object-navigate.html | 16 +++++ resource-timing/object-refresh.html | 21 +----- resource-timing/object-reload-back.html | 16 ----- resource-timing/object-reload.html | 33 --------- .../resources/embed-navigate-back.html | 36 +--------- .../resources/iframe-navigate-back.html | 36 +--------- resource-timing/resources/nested-contexts.js | 68 +++++++++++++++++++ .../resources/object-navigate-back.html | 36 +--------- 18 files changed, 153 insertions(+), 282 deletions(-) create mode 100644 resource-timing/iframe-navigate-back.html create mode 100644 resource-timing/iframe-navigate.html delete mode 100644 resource-timing/iframe-reload-back.html delete mode 100644 resource-timing/iframe-reload.html create mode 100644 resource-timing/object-navigate-back.html create mode 100644 resource-timing/object-navigate.html delete mode 100644 resource-timing/object-reload-back.html delete mode 100644 resource-timing/object-reload.html create mode 100644 resource-timing/resources/nested-contexts.js diff --git a/lint.whitelist b/lint.whitelist index 31a001c9f6490c..7f267f918460fb 100644 --- a/lint.whitelist +++ b/lint.whitelist @@ -187,6 +187,7 @@ SET TIMEOUT: payment-request/allowpaymentrequest/setting-allowpaymentrequest-tim SET TIMEOUT: preload/single-download-preload.html SET TIMEOUT: resize-observer/resources/iframe.html SET TIMEOUT: resource-timing/resources/iframe-TAO* +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 diff --git a/resource-timing/embed-navigate-back.html b/resource-timing/embed-navigate-back.html index 83bd8a95c5ee50..1d5564dfb8efce 100644 --- a/resource-timing/embed-navigate-back.html +++ b/resource-timing/embed-navigate-back.html @@ -6,11 +6,11 @@ diff --git a/resource-timing/embed-navigate.html b/resource-timing/embed-navigate.html index 38047c2185ed21..910c68087fe9b0 100644 --- a/resource-timing/embed-navigate.html +++ b/resource-timing/embed-navigate.html @@ -5,27 +5,10 @@ Resource Timing embed navigate + + + + + diff --git a/resource-timing/iframe-navigate.html b/resource-timing/iframe-navigate.html new file mode 100644 index 00000000000000..a66e6468d48670 --- /dev/null +++ b/resource-timing/iframe-navigate.html @@ -0,0 +1,16 @@ + + + + +Resource Timing iframe navigate + + + + + + diff --git a/resource-timing/iframe-refresh.html b/resource-timing/iframe-refresh.html index 2154aaffb220a9..89557e566fa4a8 100644 --- a/resource-timing/iframe-refresh.html +++ b/resource-timing/iframe-refresh.html @@ -5,27 +5,10 @@ Resource Timing iframe refresh + - - - diff --git a/resource-timing/iframe-reload.html b/resource-timing/iframe-reload.html deleted file mode 100644 index b807121be341a5..00000000000000 --- a/resource-timing/iframe-reload.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - -Resource Timing iframe navigate - - - - - diff --git a/resource-timing/object-navigate-back.html b/resource-timing/object-navigate-back.html new file mode 100644 index 00000000000000..a48950a30a5a92 --- /dev/null +++ b/resource-timing/object-navigate-back.html @@ -0,0 +1,16 @@ + + + + +Resource Timing object navigate - back button navigation + + + + diff --git a/resource-timing/object-navigate.html b/resource-timing/object-navigate.html new file mode 100644 index 00000000000000..5b10580c3577c9 --- /dev/null +++ b/resource-timing/object-navigate.html @@ -0,0 +1,16 @@ + + + + +Resource Timing object navigate + + + + + + diff --git a/resource-timing/object-refresh.html b/resource-timing/object-refresh.html index 2535412155252f..28a87a5547b38d 100644 --- a/resource-timing/object-refresh.html +++ b/resource-timing/object-refresh.html @@ -5,27 +5,10 @@ Resource Timing object refresh + - - - diff --git a/resource-timing/object-reload.html b/resource-timing/object-reload.html deleted file mode 100644 index 0e42213faef7c0..00000000000000 --- a/resource-timing/object-reload.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - -Resource Timing object navigate - - - - - diff --git a/resource-timing/resources/embed-navigate-back.html b/resource-timing/resources/embed-navigate-back.html index bc4f7a56a1f344..a64d1118ca3480 100644 --- a/resource-timing/resources/embed-navigate-back.html +++ b/resource-timing/resources/embed-navigate-back.html @@ -3,41 +3,9 @@ Resource Timing embed navigate - back button navigation + diff --git a/resource-timing/embed-navigate.html b/resource-timing/embed-navigate.html index 910c68087fe9b0..a162fac3af314a 100644 --- a/resource-timing/embed-navigate.html +++ b/resource-timing/embed-navigate.html @@ -10,6 +10,7 @@ let t = async_test("Test that HTML embed navigates are not observable by the parent"); setup_navigate_test(t); +
+
diff --git a/resource-timing/iframe-navigate.html b/resource-timing/iframe-navigate.html index a66e6468d48670..34e61ce2231970 100644 --- a/resource-timing/iframe-navigate.html +++ b/resource-timing/iframe-navigate.html @@ -10,6 +10,7 @@ let t = async_test("Test that iframe navigates are not observable by the parent"); setup_navigate_test(t); +
+
diff --git a/resource-timing/object-navigate.html b/resource-timing/object-navigate.html index 5b10580c3577c9..1cedff765e9da2 100644 --- a/resource-timing/object-navigate.html +++ b/resource-timing/object-navigate.html @@ -10,6 +10,7 @@ let t = async_test("Test that object navigates are not observable by the parent"); setup_navigate_test(t); +
+
+ + diff --git a/resource-timing/iframe-navigate-back.html b/resource-timing/iframe-navigate-back.html index 1340102e0b6d7b..23d7fd846f8356 100644 --- a/resource-timing/iframe-navigate-back.html +++ b/resource-timing/iframe-navigate-back.html @@ -5,13 +5,9 @@ Resource Timing iframe navigate - back button navigation + + - diff --git a/resource-timing/object-navigate-back.html b/resource-timing/object-navigate-back.html index bd5aa41392d10d..e9a98159ef31e7 100644 --- a/resource-timing/object-navigate-back.html +++ b/resource-timing/object-navigate-back.html @@ -5,13 +5,9 @@ Resource Timing object navigate - back button navigation + + - diff --git a/resource-timing/resources/embed-navigate-back.html b/resource-timing/resources/embed-navigate-back.html index a64d1118ca3480..3c3def1d1a1d04 100644 --- a/resource-timing/resources/embed-navigate-back.html +++ b/resource-timing/resources/embed-navigate-back.html @@ -3,6 +3,7 @@ Resource Timing embed navigate - back button navigation + - - - - - diff --git a/resource-timing/embed-navigate.html b/resource-timing/embed-navigate.html deleted file mode 100644 index a162fac3af314a..00000000000000 --- a/resource-timing/embed-navigate.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing embed navigate - - - - -
- - diff --git a/resource-timing/embed-refresh.html b/resource-timing/embed-refresh.html deleted file mode 100644 index d0e6ec0f49713a..00000000000000 --- a/resource-timing/embed-refresh.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing embed refresh - - - - -
- - diff --git a/resource-timing/iframe-navigate-back.html b/resource-timing/iframe-navigate-back.html deleted file mode 100644 index 23d7fd846f8356..00000000000000 --- a/resource-timing/iframe-navigate-back.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - -Resource Timing iframe navigate - back button navigation - - - - - diff --git a/resource-timing/iframe-navigate.html b/resource-timing/iframe-navigate.html deleted file mode 100644 index 34e61ce2231970..00000000000000 --- a/resource-timing/iframe-navigate.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing iframe navigate - - - - -
- - diff --git a/resource-timing/iframe-refresh.html b/resource-timing/iframe-refresh.html deleted file mode 100644 index 95f711cacd2b16..00000000000000 --- a/resource-timing/iframe-refresh.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing iframe refresh - - - - -
- - diff --git a/resource-timing/nested-context-navigations.html b/resource-timing/nested-context-navigations.html new file mode 100644 index 00000000000000..501928208e0745 --- /dev/null +++ b/resource-timing/nested-context-navigations.html @@ -0,0 +1,30 @@ + + + + +Resource Timing embed navigate - back button navigation + + + + + + diff --git a/resource-timing/object-navigate-back.html b/resource-timing/object-navigate-back.html deleted file mode 100644 index e9a98159ef31e7..00000000000000 --- a/resource-timing/object-navigate-back.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - -Resource Timing object navigate - back button navigation - - - - - diff --git a/resource-timing/object-navigate.html b/resource-timing/object-navigate.html deleted file mode 100644 index 1cedff765e9da2..00000000000000 --- a/resource-timing/object-navigate.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing object navigate - - - - -
- - diff --git a/resource-timing/object-refresh.html b/resource-timing/object-refresh.html deleted file mode 100644 index b46f1046d89a43..00000000000000 --- a/resource-timing/object-refresh.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - -Resource Timing object refresh - - - - -
- - diff --git a/resource-timing/resources/embed-navigate.html b/resource-timing/resources/embed-navigate.html new file mode 100644 index 00000000000000..20a73c662b4f7b --- /dev/null +++ b/resource-timing/resources/embed-navigate.html @@ -0,0 +1,15 @@ + + + + +Resource Timing embed navigate + + + +
+ + diff --git a/resource-timing/resources/embed-refresh.html b/resource-timing/resources/embed-refresh.html new file mode 100644 index 00000000000000..4a49fd0b4c1b54 --- /dev/null +++ b/resource-timing/resources/embed-refresh.html @@ -0,0 +1,15 @@ + + + + +Resource Timing embed refresh + + + +
+ + diff --git a/resource-timing/resources/iframe-navigate.html b/resource-timing/resources/iframe-navigate.html new file mode 100644 index 00000000000000..2a1a7e063619fe --- /dev/null +++ b/resource-timing/resources/iframe-navigate.html @@ -0,0 +1,15 @@ + + + + +Resource Timing iframe navigate + + + +
+ + diff --git a/resource-timing/resources/iframe-refresh.html b/resource-timing/resources/iframe-refresh.html new file mode 100644 index 00000000000000..4ce3ea0424297a --- /dev/null +++ b/resource-timing/resources/iframe-refresh.html @@ -0,0 +1,15 @@ + + + + +Resource Timing iframe refresh + + + +
+ + diff --git a/resource-timing/resources/nested-contexts.js b/resource-timing/resources/nested-contexts.js index 930ad3fbd984e1..03b47030674b9e 100644 --- a/resource-timing/resources/nested-contexts.js +++ b/resource-timing/resources/nested-contexts.js @@ -9,33 +9,40 @@ const post_navigate_url = new URL("/resource-timing/resources/document-navigated const pre_refresh_url = new URL("/resource-timing/resources/document-that-refreshes.html", destination).href; const post_refresh_url = new URL("/resource-timing/resources/document-refreshed.html", destination).href; -function setup_navigate_or_refresh(t, type, pre, post) { +function setup_navigate_or_refresh(type, pre, post) { function verify_document_navigate_not_observable() { + console.log("verifying"); let entries = performance.getEntriesByType("resource"); let found_first_document = false; for (entry of entries) { if (entry.name == pre) { found_first_document = true; } - assert_not_equals(entry.name, post, type + " document should not be observable"); + if (entry.name == post) { + opener.postMessage("FAIL - " + type + " document should not be observable", "*"); + return; + } + } + if (!found_first_document) { + opener.postMessage("FAIL - initial document should be observable", "*"); + return; } - assert_true(found_first_document, "Initial document should be observable"); - t.done(); + console.log("pass"); + opener.postMessage("PASS", "*"); } - window.addEventListener("message", t.step_func(e=>{ + window.addEventListener("message", e=>{ if (e.data == type) { verify_document_navigate_not_observable(); } - })); - + }); } -function setup_navigate_test(t) { - setup_navigate_or_refresh(t, "navigated", pre_navigate_url, post_navigate_url); +function setup_navigate_test() { + setup_navigate_or_refresh("navigated", pre_navigate_url, post_navigate_url); } -function setup_refresh_test(t) { - setup_navigate_or_refresh(t, "refreshed", pre_refresh_url, post_refresh_url); +function setup_refresh_test() { + setup_navigate_or_refresh("refreshed", pre_refresh_url, post_refresh_url); } function setup_back_navigation(pushed_url) { @@ -73,7 +80,7 @@ function setup_back_navigation(pushed_url) { }); } -function open_navigate_back_window(url, message) { +function open_test_window(url, message) { promise_test(() => { return new Promise((resolve, reject) => { let openee = window.open(url); diff --git a/resource-timing/resources/object-navigate.html b/resource-timing/resources/object-navigate.html new file mode 100644 index 00000000000000..cbb862e7e00fcb --- /dev/null +++ b/resource-timing/resources/object-navigate.html @@ -0,0 +1,15 @@ + + + + +Resource Timing object navigate + + + +
+ + diff --git a/resource-timing/resources/object-refresh.html b/resource-timing/resources/object-refresh.html new file mode 100644 index 00000000000000..b14cf7f17c9d80 --- /dev/null +++ b/resource-timing/resources/object-refresh.html @@ -0,0 +1,15 @@ + + + + +Resource Timing object refresh + + + +
+ + From 69dd2aaae27af82bca339683c44a489627d82b41 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Wed, 13 Mar 2019 14:57:19 +0100 Subject: [PATCH 11/13] lint --- resource-timing/resources/nested-contexts.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/resource-timing/resources/nested-contexts.js b/resource-timing/resources/nested-contexts.js index 03b47030674b9e..f9c74b59c34ff2 100644 --- a/resource-timing/resources/nested-contexts.js +++ b/resource-timing/resources/nested-contexts.js @@ -11,7 +11,6 @@ const post_refresh_url = new URL("/resource-timing/resources/document-refreshed. function setup_navigate_or_refresh(type, pre, post) { function verify_document_navigate_not_observable() { - console.log("verifying"); let entries = performance.getEntriesByType("resource"); let found_first_document = false; for (entry of entries) { @@ -27,7 +26,6 @@ function setup_navigate_or_refresh(type, pre, post) { opener.postMessage("FAIL - initial document should be observable", "*"); return; } - console.log("pass"); opener.postMessage("PASS", "*"); } window.addEventListener("message", e=>{ From 7f004db574cf983b975b2fcc491347a885aa9b11 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Wed, 13 Mar 2019 15:18:47 +0100 Subject: [PATCH 12/13] Long timeout to make the bots happy --- resource-timing/nested-context-navigations.html | 1 + 1 file changed, 1 insertion(+) diff --git a/resource-timing/nested-context-navigations.html b/resource-timing/nested-context-navigations.html index 501928208e0745..483cc5b82d5deb 100644 --- a/resource-timing/nested-context-navigations.html +++ b/resource-timing/nested-context-navigations.html @@ -2,6 +2,7 @@ + Resource Timing embed navigate - back button navigation From 50b4cd24256107e2f5636150fc4e31007864a7c4 Mon Sep 17 00:00:00 2001 From: Yoav Weiss Date: Wed, 13 Mar 2019 15:20:28 +0100 Subject: [PATCH 13/13] const --- resource-timing/resources/nested-contexts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource-timing/resources/nested-contexts.js b/resource-timing/resources/nested-contexts.js index f9c74b59c34ff2..0c202243702aec 100644 --- a/resource-timing/resources/nested-contexts.js +++ b/resource-timing/resources/nested-contexts.js @@ -1,6 +1,6 @@ let destination = location; if (location.search == "?crossorigin") { - host_info = get_host_info() + const host_info = get_host_info() destination = location.protocol + "//" + host_info["REMOTE_HOST"] + ":" + location.port; }