third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-reload.html - Issue 1883873002: Do not block document.written scripts in page reloads

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-reload.html

Issue 1883873002: Do not block document.written scripts in page reloads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Feedback incorporated. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-block.html ('K') | « third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-conn-type.html ('k') | third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-reload-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

	2 <script src="../resources/testharness.js"></script>

	3 <script src="../resources/testharnessreport.js"></script>

	4 <script>

	5 var reloadTestSuccess = false;

	6 </script>

	7

	8 <script>

	9 if (window.internals) {

	10 internals.settings.setDisallowFetchForDocWrittenScriptsInMainFrameOnSlow Connections(true);

	11 internals.setNetworkStateNotifierTestOnly(true);

	12 internals.setNetworkConnectionInfo('cellular2g', 1.0);

	13 internals.evictAllResources();

	14

	15 window.addEventListener('beforeunload', function() {

	16 internals.settings.setDisallowFetchForDocWrittenScriptsInMainFrameOn SlowConnections(false);

	17 internals.setNetworkStateNotifierTestOnly(false);

	18 // Remove localStorage items , just in case they haven't been
	jkarlin 2016/04/18 14:00:43 s/ ,/,/ s/ ,/,/ shivanisha 2016/04/18 17:03:38 done. Show quoted text On 2016/04/18 at 14:00:43, jkarlin wrote: > s/ ,/,/ done.
	19 // already removed, due to test failure.

	20 window.localStorage.removeItem("blocked-on-first-load");

	21 window.localStorage.removeItem("successful-on-first-reload");

	22 }, false);

	23 }

	24

	25 var crossOrigin = 'http://localhost:8000';

	26 var filePath = '/loading/resources/js-loaded.js?reload';

	27

	28 // First time the script will be blocked and onError will reload the page.

	29 // On reload the script should not be blocked
	jkarlin 2016/04/18 14:00:43 Missing period Missing period shivanisha 2016/04/18 17:03:38 Added. Show quoted text On 2016/04/18 at 14:00:43, jkarlin wrote: > Missing period Added.
	30 // This tests does 2 reloads: first reload will bypass the cache and
	jkarlin 2016/04/18 14:00:43 This sentence is rough. How about, "This tests two This sentence is rough. How about, "This tests two types of reload, one with and one without cache bypass." shivanisha 2016/04/18 17:03:38 Updated. Show quoted text On 2016/04/18 at 14:00:43, jkarlin wrote: > This sentence is rough. How about, "This tests two types of reload, one with and one without cache bypass." Updated.
	31 // the second reload will not.

	32 // Script should not be blocked in both cases.
	jkarlin 2016/04/18 14:00:43 s/Script/The script/ s/Script/The script/ shivanisha 2016/04/18 17:03:38 done. Show quoted text On 2016/04/18 at 14:00:43, jkarlin wrote: > s/Script/The script/ done.
	33 src = crossOrigin + filePath;

	34 document.write('<scr' + 'ipt src="' + src + '" onload="succTest()" onError=" errTest()"></scr' + 'ipt>');

	35

	36 function succTest() {

	37 if (window.localStorage.getItem("blocked-on-first-load") == "true") {

	38 window.localStorage.removeItem("blocked-on-first-load");

	39 window.localStorage.setItem("successful-on-first-reload", "true")

	40 internals.forceReload(true);

	41 }

	42

	43 else if (window.localStorage.getItem("successful-on-first-reload") == "t rue") {

	44 window.localStorage.removeItem("successful-on-first-reload");

	45 reloadTestSuccess=true;

	46 }

	47 }

	48

	49 function errTest() {

	50 window.localStorage.setItem("blocked-on-first-load", "true")
	jkarlin 2016/04/18 14:00:43 How do you know this was the first load that faile How do you know this was the first load that failed? If you instead counted you could verify like this (note this isn't valid js): assert_eq(0, window.localStorage.getItem("errCount")); assert_eq(0, window.localStorage.getItem("succCount")); Then, in succTest you could have: assert_eq(1, window.localStorage.getItem("errCount")); assert_lt(2, window.localStorage.getItem("succCount")); if (window.localStorage.getItem("succCount") == 0) { ... } else if (window.localStorage.getItem("succCount") == 1) { ... } else { NOTREACHED(); } shivanisha 2016/04/18 17:20:51 Updated. Show quoted text On 2016/04/18 at 14:00:43, jkarlin wrote: > How do you know this was the first load that failed? > > If you instead counted you could verify like this (note this isn't valid js): > > assert_eq(0, window.localStorage.getItem("errCount")); > assert_eq(0, window.localStorage.getItem("succCount")); > > Then, in succTest you could have: > > assert_eq(1, window.localStorage.getItem("errCount")); > assert_lt(2, window.localStorage.getItem("succCount")); > > if (window.localStorage.getItem("succCount") == 0) { > ... > } else if (window.localStorage.getItem("succCount") == 1) { > ... > } else { > NOTREACHED(); > } Updated.
	51 if (window.internals) {

	52 internals.forceReload(false);

	53 }

	54 }

	55

	56 </script>

	57

	58 <script>

	59 test(function () {

	60 assert_true(reloadTestSuccess);

	61 }, "cross origin doc.written scripts are not blocked in a page reload");

	62 </script>

OLD	NEW