Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html

Issue 290803002: Return an absolute URL for HTMLImageElement.currentSrc (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase and review nits Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/dom/HTMLImageElement/image-sizes-1x-expected.txt ('k') | LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html
diff --git a/LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html b/LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html
index 1103b7d7e7059d79d1b5e77d0449637dffe74e63..e5bd09a3d9680416fa19b174c5b1e4afe53befac 100644
--- a/LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html
+++ b/LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x.html
@@ -1,59 +1,54 @@
-<html>
-<head>
+<!DOCTYPE html>
<script>
window.targetScaleFactor = 2;
</script>
<script src="../../hidpi/resources/srcset-helper.js"></script>
<script src="../../../resources/js-test.js"></script>
+<script src="resources/currentSrcHelper.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
addEventListener("load", function() {
shouldBe('document.getElementById("simple").clientWidth', 'window.innerWidth');
- shouldBe('document.getElementById("simple").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("simple")', '"image-set-2x.png"');
shouldBe('document.getElementById("small_sizes").clientWidth', '300');
- shouldBe('document.getElementById("small_sizes").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("small_sizes")', '"image-set-2x.png"');
shouldBe('document.getElementById("sizes_x_descriptors").clientWidth', '400');
- shouldBe('document.getElementById("sizes_x_descriptors").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("sizes_x_descriptors")', '"image-set-2x.png"');
shouldBe('document.getElementById("sizes_src").clientWidth', '400');
- shouldBe('document.getElementById("sizes_src").currentSrc', '"../../hidpi/resources/image-set-1x.png"');
+ shouldBe('currentSrcFileName("sizes_src")', '"image-set-1x.png"');
shouldBe('document.getElementById("default_sizes").clientWidth', 'window.innerWidth');
- shouldBe('document.getElementById("default_sizes").currentSrc', '"resources/image-set-4x.png"');
+ shouldBe('currentSrcFileName("default_sizes")', '"image-set-4x.png"');
shouldBe('document.getElementById("invalid_length").clientWidth', 'window.innerWidth');
- shouldBe('document.getElementById("invalid_length").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("invalid_length")', '"image-set-2x.png"');
shouldBeCloseTo('document.getElementById("src_and_w").clientWidth', 700, 1/64);
- shouldBe('document.getElementById("src_and_w").currentSrc', '"resources/image-set-4x.png"');
+ shouldBe('currentSrcFileName("src_and_w")', '"image-set-4x.png"');
shouldBeCloseTo('document.getElementById("x_and_w").clientWidth', 700, 1/64);
- shouldBe('document.getElementById("x_and_w").currentSrc', '"resources/image-set-4x.png"');
+ shouldBe('currentSrcFileName("x_and_w")', '"image-set-4x.png"');
shouldBe('document.getElementById("x_and_w2").clientWidth', '400');
- shouldBe('document.getElementById("x_and_w2").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("x_and_w2")', '"image-set-2x.png"');
shouldBe('document.getElementById("x_and_w3").clientWidth', '400');
- shouldBe('document.getElementById("x_and_w3").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("x_and_w3")', '"image-set-2x.png"');
shouldBe('document.getElementById("half_size").clientWidth', '(window.innerWidth/2)');
- shouldBe('document.getElementById("half_size").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("half_size")', '"image-set-2x.png"');
shouldBe('document.getElementById("infitisimal_sizes").clientWidth', '(window.innerWidth/100)');
- shouldBe('document.getElementById("infitisimal_sizes").currentSrc', '"../../hidpi/resources/image-set-2x.png"');
+ shouldBe('currentSrcFileName("infitisimal_sizes")', '"image-set-2x.png"');
}, false);
</script>
-</head>
-
-<body id="body">
- <img id="simple" src="" sizes="(max-width: 300px) 400px, 800px" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
- <img id="small_sizes" src="" sizes="300px" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
- <!-- 'sizes' has no impact on 'x' or 'src' resources -->
- <img id="sizes_x_descriptors" src="" sizes="50vw" srcset="../../hidpi/resources/image-set-1x.png 1x, ../../hidpi/resources/image-set-2x.png 2x">
- <img id="sizes_src" src="../../hidpi/resources/image-set-1x.png" sizes="50vw">
- <!-- Missing sizes or an invalid one, give a source size of 100vw -->
- <img id="default_sizes" src="" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 1600w">
- <img id="invalid_length" src="" sizes="(max-width: 300px) 400w, 800w" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
- <img id="src_and_w" src="../../hidpi/resources/image-set-1x.png" sizes="700px" srcset="resources/image-set-4x.png 1600w">
- <img id="x_and_w" sizes="700px" srcset="../../hidpi/resources/image-set-1x.png 0.5x, resources/image-set-4x.png 1600w">
- <!-- The 'x' resource should be picked, and 'sizes' have no impact on its intrisic size -->
- <img id="x_and_w2" sizes="700px" srcset="../../hidpi/resources/image-set-2x.png 2x, resources/image-set-4x.png 16000w">
- <img id="x_and_w3" sizes="700px" srcset="resources/image-set-4x.png 16000w, ../../hidpi/resources/image-set-2x.png 2x">
- <!-- The intrinsic size should be identical to the 'sizes' value -->
- <img id="half_size" sizes="50vw" srcset="../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 16000w">
- <img id="infitisimal_sizes" sizes="1vw" srcset="../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 16000w">
-</body>
-</html>
+<img id="simple" src="" sizes="(max-width: 300px) 400px, 800px" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
+<img id="small_sizes" src="" sizes="300px" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
+<!-- 'sizes' has no impact on 'x' or 'src' resources -->
+<img id="sizes_x_descriptors" src="" sizes="50vw" srcset="../../hidpi/resources/image-set-1x.png 1x, ../../hidpi/resources/image-set-2x.png 2x">
+<img id="sizes_src" src="../../hidpi/resources/image-set-1x.png" sizes="50vw">
+<!-- Missing sizes or an invalid one, give a source size of 100vw -->
+<img id="default_sizes" src="" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 1600w">
+<img id="invalid_length" src="" sizes="(max-width: 300px) 400w, 800w" srcset="../../hidpi/resources/image-set-1x.png 400w, ../../hidpi/resources/image-set-2x.png 800w">
+<img id="src_and_w" src="../../hidpi/resources/image-set-1x.png" sizes="700px" srcset="resources/image-set-4x.png 1600w">
+<img id="x_and_w" sizes="700px" srcset="../../hidpi/resources/image-set-1x.png 0.5x, resources/image-set-4x.png 1600w">
+<!-- The 'x' resource should be picked, and 'sizes' have no impact on its intrisic size -->
+<img id="x_and_w2" sizes="700px" srcset="../../hidpi/resources/image-set-2x.png 2x, resources/image-set-4x.png 16000w">
+<img id="x_and_w3" sizes="700px" srcset="resources/image-set-4x.png 16000w, ../../hidpi/resources/image-set-2x.png 2x">
+<!-- The intrinsic size should be identical to the 'sizes' value -->
+<img id="half_size" sizes="50vw" srcset="../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 16000w">
+<img id="infitisimal_sizes" sizes="1vw" srcset="../../hidpi/resources/image-set-2x.png 800w, resources/image-set-4x.png 16000w">
« no previous file with comments | « LayoutTests/fast/dom/HTMLImageElement/image-sizes-1x-expected.txt ('k') | LayoutTests/fast/dom/HTMLImageElement/image-sizes-2x-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698