[webkit-changes] [194928] trunk/LayoutTests

Tue, 12 Jan 2016 14:29:47 -0800

Title: [194928] trunk/LayoutTests
Revision
194928
Author
[email protected]
Date
2016-01-12 14:29:43 -0800 (Tue, 12 Jan 2016)

Log Message

Avoid downloading the wrong image for <picture> elements.
https://bugs.webkit.org/show_bug.cgi?id=153027

Reviewed by Dean Jackson.

* fast/picture/image-picture-loads-1x-expected.txt: Added.
* fast/picture/image-picture-loads-1x.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (194927 => 194928)


--- trunk/LayoutTests/ChangeLog	2016-01-12 22:28:59 UTC (rev 194927)
+++ trunk/LayoutTests/ChangeLog	2016-01-12 22:29:43 UTC (rev 194928)
@@ -1,3 +1,13 @@
+2016-01-12  Dave Hyatt  <[email protected]>
+
+        Avoid downloading the wrong image for <picture> elements.
+        https://bugs.webkit.org/show_bug.cgi?id=153027
+
+        Reviewed by Dean Jackson.
+
+        * fast/picture/image-picture-loads-1x-expected.txt: Added.
+        * fast/picture/image-picture-loads-1x.html: Added.
+
 2016-01-12  Daniel Bates  <[email protected]>
 
         XSS Auditor should navigate to empty substitute data on full page block

Added: trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt (0 => 194928)


--- trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt	2016-01-12 22:29:43 UTC (rev 194928)
@@ -0,0 +1,13 @@
+image-set-2x.png - willSendRequest <NSURLRequest URL image-set-2x.png, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+resources/image-set-4x.png - willSendRequest <NSURLRequest URL resources/image-set-4x.png, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+data:,b - willSendRequest <NSURLRequest URL data:,b, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+image-picture-loads-1x.html - didFinishLoading
+image-set-2x.png - didReceiveResponse <NSURLResponse image-set-2x.png, http status code 0>
+image-set-2x.png - didFinishLoading
+resources/image-set-4x.png - didReceiveResponse <NSURLResponse resources/image-set-4x.png, http status code 0>
+resources/image-set-4x.png - didFinishLoading
+data:,b - didReceiveResponse <NSURLResponse data:,b, http status code 0>
+data:,b - didFinishLoading
+   
+some text
+

Added: trunk/LayoutTests/fast/picture/image-picture-loads-1x.html (0 => 194928)


--- trunk/LayoutTests/fast/picture/image-picture-loads-1x.html	                        (rev 0)
+++ trunk/LayoutTests/fast/picture/image-picture-loads-1x.html	2016-01-12 22:29:43 UTC (rev 194928)
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+	<script>
+        if (window.testRunner) {
+	        testRunner.dumpAsText();
+            testRunner.dumpResourceLoadCallbacks();
+        }
+	</script>
+	<!-- simple picture construct -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="simple" src=""
+	</picture>
+	<!-- Multiple img elements -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img src=""
+	    <img id="multiple" src=""
+	</picture>
+	<!-- non-source children - should be ignored-->
+	<picture>
+	    <div>some text</div>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="other_children" src=""
+	</picture>
+	<!-- source with unknown type - should be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" type="image/nonsense" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="unknown_type" src=""
+	</picture>
+	<!-- SVG source - should not be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" type="image/svg+xml" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="svg_type" src=""
+	</picture>
+	<!-- Empty type - should not be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" type="" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="empty_type" src=""
+	</picture>
+	<!-- whitespace type - should not be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" type=" " sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="whitespace_type" src=""
+	</picture>
+	<!-- parameter type - should not be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" type="image/png;bla=bla" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+	        resources/image-set-4x.png?10002 1600w">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="parameter_type" src=""
+	</picture>
+	<!-- source with empty srcset - should be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" sizes="800px" srcset=", ,  ">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="empty_srcset" src=""
+	</picture>
+	<!-- source with no srcset - should be ignored -->
+	<picture>
+	    <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+	        resources/image-set-4x.png?10001 1600w">
+	    <source media="(max-width: 800px)" sizes="800px">
+	    <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+	        resources/image-set-4x.png?10003 1600w">
+	    <img id="no_srcset" src=""
+	</picture>
+    <picture><source srcset="data:,b"><img src=""

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to