LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html - Issue 715863004: Update a couple more tests for load completion definition change

Side by Side Diff: LayoutTests/fast/dom/HTMLImageElement/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

« no previous file with comments | « no previous file | LayoutTests/fast/dom/HTMLImageElement/image-sizes-js-change.html » ('j') | no next file with comments »

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <script>	2 <script>

3 window.targetScaleFactor = 2;	3 window.targetScaleFactor = 2;

4 </script>	4 </script>

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

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

	7 <script src="../../../resources/run-after-display.js"></script>
	dcheng 2014/11/12 21:30:33 This doesn't seem to be used. This doesn't seem to be used.
7 <script src="resources/currentSrcHelper.js"></script>	8 <script src="resources/currentSrcHelper.js"></script>

8 <script>	9 <script>

9 if (window.testRunner)	10 if (window.testRunner)

10 testRunner.dumpAsText();	11 testRunner.dumpAsText();

	12 window.manualNotifyDone = true;
	dcheng 2014/11/12 21:30:33 srcset-helper.js doesn't (seem) to be widely used srcset-helper.js doesn't (seem) to be widely used yet. Would it be possible to update the tests that use it so we don't need this magic variable? Nate Chapin 2014/11/12 21:33:28 It's used in ~50 tests. I can do that if you reall Show quoted text On 2014/11/12 21:30:33, dcheng wrote: > srcset-helper.js doesn't (seem) to be widely used yet. Would it be possible to > update the tests that use it so we don't need this magic variable? It's used in ~50 tests. I can do that if you really want, but I dispute your definition of "widely used" :) dcheng 2014/11/12 21:43:41 Codesearch fail =/ Would it be possible to just t Show quoted text On 2014/11/12 at 21:33:28, Nate Chapin wrote: > On 2014/11/12 21:30:33, dcheng wrote: > > srcset-helper.js doesn't (seem) to be widely used yet. Would it be possible to > > update the tests that use it so we don't need this magic variable? > > It's used in ~50 tests. I can do that if you really want, but I dispute your definition of "widely used" :) Codesearch fail =/ Would it be possible to just to wrap the notifyDone() in srcset-helper.js in a setTimeout(..., 0) then?
	13 var reloaded = sessionStorage.pageReloaded;
	dcheng 2014/11/12 21:30:33 Yikes, magic variables =/ Yikes, magic variables =/
11	14

12 addEventListener("load", function() {	15 addEventListener("load", function() {

13 shouldBe('document.getElementById("simple").clientWidth', 'window.innerW idth');	16 shouldBe('document.getElementById("simple").clientWidth', 'window.innerW idth');

14 shouldBe('currentSrcFileNameNoParams("simple")', '"image-set-2x.png"');	17 shouldBe('currentSrcFileNameNoParams("simple")', '"image-set-2x.png"');

15 shouldBe('document.getElementById("small_sizes").clientWidth', '300');	18 shouldBe('document.getElementById("small_sizes").clientWidth', '300');

16 shouldBe('currentSrcFileNameNoParams("small_sizes")', '"image-set-2x.png "');	19 shouldBe('currentSrcFileNameNoParams("small_sizes")', '"image-set-2x.png "');

17 shouldBe('document.getElementById("sizes_x_descriptors").clientWidth', ' 400');	20 shouldBe('document.getElementById("sizes_x_descriptors").clientWidth', ' 400');

18 shouldBe('currentSrcFileNameNoParams("sizes_x_descriptors")', '"image-se t-2x.png"');	21 shouldBe('currentSrcFileNameNoParams("sizes_x_descriptors")', '"image-se t-2x.png"');

19 shouldBe('document.getElementById("sizes_src").clientWidth', '400');	22 shouldBe('document.getElementById("sizes_src").clientWidth', '400');

20 shouldBe('currentSrcFileNameNoParams("sizes_src")', '"image-set-1x.png"' );	23 shouldBe('currentSrcFileNameNoParams("sizes_src")', '"image-set-1x.png"' );

21 shouldBe('document.getElementById("default_sizes").clientWidth', 'window .innerWidth');	24 shouldBe('document.getElementById("default_sizes").clientWidth', 'window .innerWidth');

22 shouldBe('currentSrcFileNameNoParams("default_sizes")', '"image-set-4x.p ng"');	25 shouldBe('currentSrcFileNameNoParams("default_sizes")', '"image-set-4x.p ng"');

23 shouldBe('document.getElementById("invalid_length").clientWidth', 'windo w.innerWidth');	26 shouldBe('document.getElementById("invalid_length").clientWidth', 'windo w.innerWidth');

24 shouldBe('currentSrcFileNameNoParams("invalid_length")', '"image-set-2x. png"');	27 shouldBe('currentSrcFileNameNoParams("invalid_length")', '"image-set-2x. png"');

25 shouldBeCloseTo('document.getElementById("src_and_w").clientWidth', 700, 1/64);	28 shouldBeCloseTo('document.getElementById("src_and_w").clientWidth', 700, 1/64);

26 shouldBe('currentSrcFileNameNoParams("src_and_w")', '"image-set-4x.png"' );	29 shouldBe('currentSrcFileNameNoParams("src_and_w")', '"image-set-4x.png"' );

27 shouldBeCloseTo('document.getElementById("x_and_w").clientWidth', 700, 1 /64);	30 shouldBeCloseTo('document.getElementById("x_and_w").clientWidth', 700, 1 /64);

28 shouldBe('currentSrcFileNameNoParams("x_and_w")', '"image-set-4x.png"');	31 shouldBe('currentSrcFileNameNoParams("x_and_w")', '"image-set-4x.png"');

29 shouldBe('document.getElementById("x_and_w2").clientWidth', '400');	32 shouldBe('document.getElementById("x_and_w2").clientWidth', '400');

30 shouldBe('currentSrcFileNameNoParams("x_and_w2")', '"image-set-2x.png"') ;	33 shouldBe('currentSrcFileNameNoParams("x_and_w2")', '"image-set-2x.png"') ;

31 shouldBe('document.getElementById("x_and_w3").clientWidth', '400');	34 shouldBe('document.getElementById("x_and_w3").clientWidth', '400');

32 shouldBe('currentSrcFileNameNoParams("x_and_w3")', '"image-set-2x.png"') ;	35 shouldBe('currentSrcFileNameNoParams("x_and_w3")', '"image-set-2x.png"') ;

33 shouldBe('document.getElementById("half_size").clientWidth', '(window.in nerWidth/2)');	36 shouldBe('document.getElementById("half_size").clientWidth', '(window.in nerWidth/2)');

34 shouldBe('currentSrcFileNameNoParams("half_size")', '"image-set-2x.png"' );	37 shouldBe('currentSrcFileNameNoParams("half_size")', '"image-set-2x.png"' );

35 shouldBe('document.getElementById("infitisimal_sizes").clientWidth', '(w indow.innerWidth/100)');	38 shouldBe('document.getElementById("infitisimal_sizes").clientWidth', '(w indow.innerWidth/100)');

36 shouldBe('currentSrcFileNameNoParams("infitisimal_sizes")', '"image-set- 2x.png"');	39 shouldBe('currentSrcFileNameNoParams("infitisimal_sizes")', '"image-set- 2x.png"');

	40

	41 if (window.testRunner && reloaded)

	42 testRunner.notifyDone();

37 }, false);	43 }, false);

38 </script>	44 </script>

39 <img id="simple" src="" sizes="(max-width: 300px) 400px, 800px" srcset="../../hi dpi/resources/image-set-1x.png?1 400w, ../../hidpi/resources/image-set-2x.png?1 800w">	45 <img id="simple" src="" sizes="(max-width: 300px) 400px, 800px" srcset="../../hi dpi/resources/image-set-1x.png?1 400w, ../../hidpi/resources/image-set-2x.png?1 800w">

40 <img id="small_sizes" src="" sizes="300px" srcset="../../hidpi/resources/image-s et-1x.png?2 400w, ../../hidpi/resources/image-set-2x.png?2 800w">	46 <img id="small_sizes" src="" sizes="300px" srcset="../../hidpi/resources/image-s et-1x.png?2 400w, ../../hidpi/resources/image-set-2x.png?2 800w">

41 <!-- 'sizes' has no impact on 'x' or 'src' resources -->	47 <!-- 'sizes' has no impact on 'x' or 'src' resources -->

42 <img id="sizes_x_descriptors" src="" sizes="50vw" srcset="../../hidpi/resources/ image-set-1x.png?3 1x, ../../hidpi/resources/image-set-2x.png?3 2x">	48 <img id="sizes_x_descriptors" src="" sizes="50vw" srcset="../../hidpi/resources/ image-set-1x.png?3 1x, ../../hidpi/resources/image-set-2x.png?3 2x">

43 <img id="sizes_src" src="../../hidpi/resources/image-set-1x.png?4" sizes="50vw">	49 <img id="sizes_src" src="../../hidpi/resources/image-set-1x.png?4" sizes="50vw">

44 <!-- Missing sizes or an invalid one, give a source size of 100vw -->	50 <!-- Missing sizes or an invalid one, give a source size of 100vw -->

45 <img id="default_sizes" src="" srcset="../../hidpi/resources/image-set-1x.png?5 400w, ../../hidpi/resources/image-set-2x.png?5 800w, resources/image-set-4x.png? 5 1600w">	51 <img id="default_sizes" src="" srcset="../../hidpi/resources/image-set-1x.png?5 400w, ../../hidpi/resources/image-set-2x.png?5 800w, resources/image-set-4x.png? 5 1600w">

46 <img id="invalid_length" src="" sizes="(max-width: 300px) 400w, 800w" srcset=".. /../hidpi/resources/image-set-1x.png?6 400w, ../../hidpi/resources/image-set-2x. png?6 800w">	52 <img id="invalid_length" src="" sizes="(max-width: 300px) 400w, 800w" srcset=".. /../hidpi/resources/image-set-1x.png?6 400w, ../../hidpi/resources/image-set-2x. png?6 800w">

47 <img id="src_and_w" src="../../hidpi/resources/image-set-1x.png?7" sizes="700px" srcset="resources/image-set-4x.png?7 1600w">	53 <img id="src_and_w" src="../../hidpi/resources/image-set-1x.png?7" sizes="700px" srcset="resources/image-set-4x.png?7 1600w">

48 <img id="x_and_w" sizes="700px" srcset="../../hidpi/resources/image-set-1x.png?8 0.5x, resources/image-set-4x.png?8 1600w">	54 <img id="x_and_w" sizes="700px" srcset="../../hidpi/resources/image-set-1x.png?8 0.5x, resources/image-set-4x.png?8 1600w">

49 <!-- The 'x' resource should be picked, and 'sizes' have no impact on its intris ic size -->	55 <!-- The 'x' resource should be picked, and 'sizes' have no impact on its intris ic size -->

50 <img id="x_and_w2" sizes="700px" srcset="../../hidpi/resources/image-set-2x.png? 9 2x, resources/image-set-4x.png?9 16000w">	56 <img id="x_and_w2" sizes="700px" srcset="../../hidpi/resources/image-set-2x.png? 9 2x, resources/image-set-4x.png?9 16000w">

51 <img id="x_and_w3" sizes="700px" srcset="resources/image-set-4x.png?10 16000w, . ./../hidpi/resources/image-set-2x.png?10 2x">	57 <img id="x_and_w3" sizes="700px" srcset="resources/image-set-4x.png?10 16000w, . ./../hidpi/resources/image-set-2x.png?10 2x">

52 <!-- The intrinsic size should be identical to the 'sizes' value -->	58 <!-- The intrinsic size should be identical to the 'sizes' value -->

53 <img id="half_size" sizes="50vw" srcset="../../hidpi/resources/image-set-2x.png? 11 800w, resources/image-set-4x.png?11 16000w">	59 <img id="half_size" sizes="50vw" srcset="../../hidpi/resources/image-set-2x.png? 11 800w, resources/image-set-4x.png?11 16000w">

54 <img id="infitisimal_sizes" sizes="1vw" srcset="../../hidpi/resources/image-set- 2x.png?12 800w, resources/image-set-4x.png?12 16000w">	60 <img id="infitisimal_sizes" sizes="1vw" srcset="../../hidpi/resources/image-set- 2x.png?12 800w, resources/image-set-4x.png?12 16000w">

OLD	NEW