WebKit Bugzilla
Attachment 371382 Details for
Bug 198533
: Make preload/link-header-preload-imagesrcset.html work on DPR != 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198533-20190605100529.patch (text/plain), 10.66 KB, created by
Rob Buis
on 2019-06-05 01:05:31 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rob Buis
Created:
2019-06-05 01:05:31 PDT
Size:
10.66 KB
patch
obsolete
>Subversion Revision: 246070 >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index d2fb48511f04e35fe26c044aa3aa221a6ad62704..4995a901c9a916980b630075824eda26ac24cb74 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,15 @@ >+2019-06-05 Rob Buis <rbuis@igalia.com> >+ >+ Make preload/link-header-preload-imagesrcset.html work on DPR != 1 >+ https://bugs.webkit.org/show_bug.cgi?id=198533 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-02 Antoine Quint <graouts@apple.com> > > [Pointer Events] Expose navigator.maxTouchPoints >diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog >index 8f1b42aff84ccdceb514f664b8eb595aae989312..ce1eb27f5015cace8a13330027873ace99b8ff47 100644 >--- a/LayoutTests/imported/w3c/ChangeLog >+++ b/LayoutTests/imported/w3c/ChangeLog >@@ -1,3 +1,15 @@ >+2019-06-05 Rob Buis <rbuis@igalia.com> >+ >+ Make preload/link-header-preload-imagesrcset.html work on DPR != 1 >+ https://bugs.webkit.org/show_bug.cgi?id=198533 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-03 Rob Buis <rbuis@igalia.com> > > Implement imagesrcset and imagesizes attributes on link rel=preload >diff --git a/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html b/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html >index e1b8431d7bcaca618014496342055d533ba7399c..6188355e26eb1bd8909184eb76230ffff69c6afd 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html >+++ b/LayoutTests/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html >@@ -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); > }); >diff --git a/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html b/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html >index b41cbee431f6aece23003276764212e737897082..3ae53fed66041957303991f082276b5c80788f83 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html >+++ b/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset.html >@@ -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); >diff --git a/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset-expected.txt b/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset-expected.txt >deleted file mode 100644 >index cf91b1ac68db9d5564921730e8542cfaf3ee9122..0000000000000000000000000000000000000000 >--- a/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/dynamic-adding-preload-imagesrcset-expected.txt >+++ /dev/null >@@ -1,3 +0,0 @@ >- >-FAIL Makes sure that a dynamically added preload with imagesrcset works assert_equals: resources/square.png?400 expected 1 but got 0 >- >diff --git a/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset-expected.txt b/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset-expected.txt >deleted file mode 100644 >index 4981a4ff45f9999fead71c9461e565d28188d333..0000000000000000000000000000000000000000 >--- a/LayoutTests/platform/ios-simulator-12-wk2/imported/w3c/web-platform-tests/preload/link-header-preload-imagesrcset-expected.txt >+++ /dev/null >@@ -1,7 +0,0 @@ >-CONSOLE MESSAGE: The resource http://localhost:8800/preload/resources/square.png?from-header&2x was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing. >-CONSOLE MESSAGE: The resource http://localhost:8800/preload/resources/square.png?from-header&800 was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing. >-CONSOLE MESSAGE: The resource http://localhost:8800/preload/resources/square.png?from-header&600 was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing. >-CONSOLE MESSAGE: line 2659: Error: assert_equals: resources/square.png?from-header&1x expected 1 but got 0 >- >-FAIL Makes sure that Link headers preload images with imagesrcset/imagesizes attributes. Error: assert_equals: resources/square.png?from-header&1x expected 1 but got 0 >-
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=371382">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198533
:
371291
|
371311
|
371318
|
371328
|
371330
|
371332
|
371335
| 371382