Title: [246629] trunk/LayoutTests
- Revision
- 246629
- Author
- [email protected]
- Date
- 2019-06-19 21:36:12 -0700 (Wed, 19 Jun 2019)
Log Message
Make preload/link-header-preload-imagesrcset.html work on DPR != 1
https://bugs.webkit.org/show_bug.cgi?id=198533
Patch by Rob Buis <[email protected]> on 2019-06-19
Reviewed by Youenn Fablet.
LayoutTests/imported/w3c:
Make the test take DPR into account.
* web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html:
* web-platform-tests/preload/link-header-preload-imagesrcset.html:
LayoutTests:
Remove unneeded iOS test expectations.
* platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset-expected.txt: Removed.
* platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset-expected.txt: Removed.
Modified Paths
Removed Paths
- trunk/LayoutTests/platform/ios-simulator-12-wk2/
Diff
Modified: trunk/LayoutTests/ChangeLog (246628 => 246629)
--- trunk/LayoutTests/ChangeLog 2019-06-20 03:18:37 UTC (rev 246628)
+++ trunk/LayoutTests/ChangeLog 2019-06-20 04:36:12 UTC (rev 246629)
@@ -1,3 +1,15 @@
+2019-06-19 Rob Buis <[email protected]>
+
+ Make preload/link-header-preload-imagesrcset.html work on DPR != 1
+ https://bugs.webkit.org/show_bug.cgi?id=198533
+
+ Reviewed by Youenn Fablet.
+
+ Remove unneeded iOS test expectations.
+
+ * platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset-expected.txt: Removed.
+ * platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset-expected.txt: Removed.
+
2019-06-19 Justin Fan <[email protected]>
[WHLSL] Create a shading language test harness
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (246628 => 246629)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-06-20 03:18:37 UTC (rev 246628)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2019-06-20 04:36:12 UTC (rev 246629)
@@ -1,3 +1,15 @@
+2019-06-19 Rob Buis <[email protected]>
+
+ Make preload/link-header-preload-imagesrcset.html work on DPR != 1
+ https://bugs.webkit.org/show_bug.cgi?id=198533
+
+ Reviewed by Youenn Fablet.
+
+ Make the test take DPR into account.
+
+ * web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html:
+ * web-platform-tests/preload/link-header-preload-imagesrcset.html:
+
2019-06-14 Ali Juma <[email protected]>
IntersectionObserver rootMargin detection fails when `root` is an element
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html (246628 => 246629)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html 2019-06-20 03:18:37 UTC (rev 246628)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html 2019-06-20 04:36:12 UTC (rev 246629)
@@ -9,6 +9,12 @@
<script>
t.step(function() {
verifyPreloadAndRTSupport();
+ var expectation = new Array(4).fill(0);
+ if (window.devicePixelRatio < 1.5) {
+ expectation[2] = 1;
+ } else if (window.devicePixelRatio >= 1.5) {
+ expectation[3] = 1;
+ }
var link = document.createElement("link");
link.as = "image";
link.rel = "preload";
@@ -17,10 +23,10 @@
link.imageSizes = "400px";
link._onload_ = t.step_func(function() {
t.step_timeout(function() {
- verifyNumberOfResourceTimingEntries("resources/square.png?default", 0);
- verifyNumberOfResourceTimingEntries("resources/square.png?200", 0);
- verifyNumberOfResourceTimingEntries("resources/square.png?400", 1);
- verifyNumberOfResourceTimingEntries("resources/square.png?800", 0);
+ verifyNumberOfResourceTimingEntries("resources/square.png?default", expectation[0]);
+ verifyNumberOfResourceTimingEntries("resources/square.png?200", expectation[1]);
+ verifyNumberOfResourceTimingEntries("resources/square.png?400", expectation[2]);
+ verifyNumberOfResourceTimingEntries("resources/square.png?800", expectation[3]);
t.done();
}, 0);
});
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html (246628 => 246629)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html 2019-06-20 03:18:37 UTC (rev 246628)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html 2019-06-20 04:36:12 UTC (rev 246629)
@@ -9,33 +9,39 @@
setup({explicit_done: true});
var iterations = 0;
+ var expectation = new Array(10).fill(0);
+ if (window.devicePixelRatio < 1.5) {
+ expectation[0] = expectation[5] = expectation[8] = 1;
+ } else if (window.devicePixelRatio >= 1.5) {
+ expectation[1] = expectation[6] = expectation[9] = 1;
+ }
function check_finished() {
- if (numberOfResourceTimingEntries('resources/square.png?from-header&1x') == 1 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&2x') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&3x') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&base') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&200') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&400') == 1 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&800') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&150') == 0 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&300') == 1 &&
- numberOfResourceTimingEntries('resources/square.png?from-header&600') == 0) {
+ if (numberOfResourceTimingEntries('resources/square.png?from-header&1x') == expectation[0] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&2x') == expectation[1] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&3x') == expectation[2] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&base') == expectation[3] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&200') == expectation[4] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&400') == expectation[5] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&800') == expectation[6] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&150') == expectation[7] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&300') == expectation[8] &&
+ numberOfResourceTimingEntries('resources/square.png?from-header&600') == expectation[9]) {
done();
}
iterations++;
if (iterations == 10) {
// At least one is expected to fail, but this should give details to the exact failure(s).
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&1x', 1);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&2x', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&3x', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&base', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&200', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&400', 1);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&800', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&150', 0);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&300', 1);
- verifyNumberOfResourceTimingEntries('resources/square.png?from-header&600', 0);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&1x', expectation[0]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&2x', expectation[1]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&3x', expectation[2]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&base', expectation[3]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&200', expectation[4]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&400', expectation[5]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&800', expectation[6]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&150', expectation[7]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&300', expectation[8]);
+ verifyNumberOfResourceTimingEntries('resources/square.png?from-header&600', expectation[9]);
done();
} else {
step_timeout(check_finished, 500);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
