LayoutTests/http/tests/loading/preload-image-sizes-2x.html - Issue 715863004: Update a couple more tests for load completion definition change

Side by Side Diff: LayoutTests/http/tests/loading/preload-image-sizes-2x.html

Issue 715863004: Update a couple more tests for load completion definition change (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 1 month 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 | Annotate | Revision Log

« LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html ('K') | « LayoutTests/fast/dom/HTMLImageElement/image-sizes-js-change.html ('k') | LayoutTests/http/tests/resources/srcset-helper.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <html>	1 <html>

2 <head>	2 <head>

3 <script src="/js-test-resources/js-test.js"></script>	3 <script src="/js-test-resources/js-test.js"></script>

4 <script>	4 <script>

5 window.targetScaleFactor = 2;	5 window.targetScaleFactor = 2;

6 </script>	6 </script>

7 <script src="../resources/srcset-helper.js"></script>	7 <script src="../resources/srcset-helper.js"></script>

8 <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>	8 <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>

9 </head>	9 </head>

10 <body>	10 <body>

11 <script>	11 <script>

	12 window.manualNotifyDone = true;

	13 var reloaded = sessionStorage.pageReloaded;

12 if (window.testRunner)	14 if (window.testRunner)

13 testRunner.dumpAsText();	15 testRunner.dumpAsText();

14 shouldBeTrue("internals.isPreloaded('resources/image2.png');");	16 shouldBeTrue("internals.isPreloaded('resources/image2.png');");

15 for (var i = 1; i <= 9; ++i) {	17 for (var i = 1; i <= 9; ++i) {

16 shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?" + i + "');");	18 shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?" + i + "');");

17 shouldBeFalse("internals.isPreloaded('resources/base-image1.png?" + i + "');");	19 shouldBeFalse("internals.isPreloaded('resources/base-image1.png?" + i + "');");

18 shouldBeTrue("internals.isPreloaded('resources/base-image2.png?" + i + " ');");	20 shouldBeTrue("internals.isPreloaded('resources/base-image2.png?" + i + " ');");

19 shouldBeFalse("internals.isPreloaded('resources/base-image3.png?" + i + "');");	21 shouldBeFalse("internals.isPreloaded('resources/base-image3.png?" + i + "');");

20 }	22 }

21 shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?7');");	23 shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?7');");

22 shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?8');");	24 shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?8');");

23 shouldBeFalse("internals.isPreloaded('resources/dup-image2.png?8');");	25 shouldBeFalse("internals.isPreloaded('resources/dup-image2.png?8');");

24 shouldBeFalse("internals.isPreloaded('resources/dup-image3.png?8');");	26 shouldBeFalse("internals.isPreloaded('resources/dup-image3.png?8');");

25 shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?10');");	27 shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?10');");

26 shouldBeTrue("internals.isPreloaded('resources/base-image1.png?10');");	28 shouldBeTrue("internals.isPreloaded('resources/base-image1.png?10');");

27 shouldBeFalse("internals.isPreloaded('resources/base-image2.png?10');");	29 shouldBeFalse("internals.isPreloaded('resources/base-image2.png?10');");

28 shouldBeFalse("internals.isPreloaded('resources/base-image3.png?10');");	30 shouldBeFalse("internals.isPreloaded('resources/base-image3.png?10');");

29	31

	32 window.onload = function() {

	33 setTimeout(function() {

	34 if (reloaded && window.testRunner)

	35 testRunner.notifyDone();

	36 }, 0);

	37 }

30 </script>	38 </script>

31 <!-- Control group -->	39 <!-- Control group -->

32 <img src="resources/image2.png">	40 <img src="resources/image2.png">

33 <!-- All permutations of src, srcset and sizes -->	41 <!-- All permutations of src, srcset and sizes -->

34 <img src="resources/preload-test.jpg?1" sizes="400px" srcset="resources/base-ima ge1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 80 0w">	42 <img src="resources/preload-test.jpg?1" sizes="400px" srcset="resources/base-ima ge1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 80 0w">

35 <img src="resources/preload-test.jpg?2" srcset="resources/base-image1.png?2 200w , resources/base-image3.png?2 400w, resources/base-image2.png?2 800w" sizes="400 px">	43 <img src="resources/preload-test.jpg?2" srcset="resources/base-image1.png?2 200w , resources/base-image3.png?2 400w, resources/base-image2.png?2 800w" sizes="400 px">

36 <img sizes="400px" src="resources/preload-test.jpg?3" srcset="resources/base-ima ge1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 80 0w">	44 <img sizes="400px" src="resources/preload-test.jpg?3" srcset="resources/base-ima ge1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 80 0w">

37 <img sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-imag e3.png?4 400w, resources/base-image2.png?4 800w" src="resources/preload-test.jpg ?4">	45 <img sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-imag e3.png?4 400w, resources/base-image2.png?4 800w" src="resources/preload-test.jpg ?4">

38 <img srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w" src="resources/preload-test.jpg?5" sizes="400 px">	46 <img srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w" src="resources/preload-test.jpg?5" sizes="400 px">

39 <img srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w" sizes="400px" src="resources/preload-test.jpg ?6">	47 <img srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w" sizes="400px" src="resources/preload-test.jpg ?6">

40 <!-- Duplicate attributes -->	48 <!-- Duplicate attributes -->

41 <img srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w" sizes="400px" src="resources/preload-test.jpg ?7"	49 <img srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w" sizes="400px" src="resources/preload-test.jpg ?7"

42 src="resources/dup-image1.png?7">	50 src="resources/dup-image1.png?7">

43 <img srcset="resources/base-image1.png?8 200w, resources/base-image3.png?8 400w, resources/base-image2.png?8 800w" sizes="400px" src="resources/preload-test.jpg ?8"	51 <img srcset="resources/base-image1.png?8 200w, resources/base-image3.png?8 400w, resources/base-image2.png?8 800w" sizes="400px" src="resources/preload-test.jpg ?8"

44 srcset="resources/dup-image1.png?8 200w, resources/dup-image3.png?8 400w, r esources/dup-image2.png?8 800w">	52 srcset="resources/dup-image1.png?8 200w, resources/dup-image3.png?8 400w, r esources/dup-image2.png?8 800w">

45 <img srcset="resources/base-image1.png?9 200w, resources/base-image3.png?9 400w, resources/base-image2.png?9 800w" sizes="400px" src="resources/preload-test.jpg ?9"	53 <img srcset="resources/base-image1.png?9 200w, resources/base-image3.png?9 400w, resources/base-image2.png?9 800w" sizes="400px" src="resources/preload-test.jpg ?9"

46 sizes="800px">	54 sizes="800px">

47 <!-- Sizes with 'x' descriptors -->	55 <!-- Sizes with 'x' descriptors -->

48 <img srcset="resources/base-image1.png?10 2x, resources/base-image3.png?10 4x, r esources/base-image2.png?10 8x" sizes="400px" src="resources/preload-test.jpg?10 ">	56 <img srcset="resources/base-image1.png?10 2x, resources/base-image3.png?10 4x, r esources/base-image2.png?10 8x" sizes="400px" src="resources/preload-test.jpg?10 ">

49 </body>	57 </body>

50 </html>	58 </html>

51	59

OLD	NEW