Title: [106103] trunk/LayoutTests
Revision
106103
Author
[email protected]
Date
2012-01-27 03:36:17 -0800 (Fri, 27 Jan 2012)

Log Message

svg/repaint/image-with-clip-path.svg is flaky under guard malloc
https://bugs.webkit.org/show_bug.cgi?id=77103

Reviewed by Zoltan Herczeg.

Fix image-with-clip-path.svg, to wait for the load of the resource, once href changes.
To do this properly, set externalResourcesRequired="true" which fires the onload event
if href changes, even if it was fired before already.

Added another testcase that only covers dynamic href changes, without using other resources.

* platform/mac/svg/repaint/image-href-change-expected.png: Added.
* platform/mac/svg/repaint/image-in-resource-href-change-expected.png: Removed.
* svg/repaint/image-href-change-expected.txt: Added.
* svg/repaint/image-href-change.svg: Added.
* svg/repaint/image-with-clip-path.svg: Fix test flakiness.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (106102 => 106103)


--- trunk/LayoutTests/ChangeLog	2012-01-27 10:25:00 UTC (rev 106102)
+++ trunk/LayoutTests/ChangeLog	2012-01-27 11:36:17 UTC (rev 106103)
@@ -1,3 +1,22 @@
+2012-01-27  Nikolas Zimmermann  <[email protected]>
+
+        svg/repaint/image-with-clip-path.svg is flaky under guard malloc
+        https://bugs.webkit.org/show_bug.cgi?id=77103
+
+        Reviewed by Zoltan Herczeg.
+
+        Fix image-with-clip-path.svg, to wait for the load of the resource, once href changes.
+        To do this properly, set externalResourcesRequired="true" which fires the onload event
+        if href changes, even if it was fired before already.
+
+        Added another testcase that only covers dynamic href changes, without using other resources.
+
+        * platform/mac/svg/repaint/image-href-change-expected.png: Added.
+        * platform/mac/svg/repaint/image-in-resource-href-change-expected.png: Removed.
+        * svg/repaint/image-href-change-expected.txt: Added.
+        * svg/repaint/image-href-change.svg: Added.
+        * svg/repaint/image-with-clip-path.svg: Fix test flakiness.
+
 2012-01-25  Yury Semikhatsky  <[email protected]>
 
         Web Inspector: should be possible to open function declaration from script popover

Added: trunk/LayoutTests/platform/mac/svg/repaint/image-href-change-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/platform/mac/svg/repaint/image-href-change-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/svg/repaint/image-href-change-expected.txt (0 => 106103)


--- trunk/LayoutTests/svg/repaint/image-href-change-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/svg/repaint/image-href-change-expected.txt	2012-01-27 11:36:17 UTC (rev 106103)
@@ -0,0 +1,2 @@
+200x200 green rect should be visible
+

Added: trunk/LayoutTests/svg/repaint/image-href-change.svg (0 => 106103)


--- trunk/LayoutTests/svg/repaint/image-href-change.svg	                        (rev 0)
+++ trunk/LayoutTests/svg/repaint/image-href-change.svg	2012-01-27 11:36:17 UTC (rev 106103)
@@ -0,0 +1,32 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <text y="-50">200x200 green rect should be visible</text>
+
+    <!-- 216x14 green rect -->
+    <image id="image" width="200" height="200" externalResourcesRequired="true"
+           xlink:href=""
+
+<script>
+    <!-- Switch to 200x200 green rect -->
+    var greenSquare = "data:image/jpg;base64,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BQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8ApUUUVynGFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAf//Z";
+
+    var image = document.getElementById("image");
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText(true);
+        layoutTestController.waitUntilDone();
+    }
+
+    function finishTest() {
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    }
+
+    function runTest() {
+        setTimeout(function() {
+            image._onload_ = function() { setTimeout(finishTest, 0); };
+            image.setAttributeNS('http://www.w3.org/1999/xlink', 'href', greenSquare);
+        }, 0);
+    }
+
+    setTimeout(runTest, 0);
+</script>
+</svg>

Modified: trunk/LayoutTests/svg/repaint/image-with-clip-path.svg (106102 => 106103)


--- trunk/LayoutTests/svg/repaint/image-with-clip-path.svg	2012-01-27 10:25:00 UTC (rev 106102)
+++ trunk/LayoutTests/svg/repaint/image-with-clip-path.svg	2012-01-27 11:36:17 UTC (rev 106103)
@@ -6,8 +6,7 @@
                 <rect id="r" x="-10" y="-10" width="20" height="20" />
             </clipPath>
         </defs>
-        <image x="-30" y="-30" width="60" height="60" clip-path="url(#p)"
-            xlink:href=""
+        <image x="-30" y="-30" width="60" height="60"  externalResourcesRequired="true" clip-path="url(#p)" xlink:href=""
     </g>
 <script>
     var green = "data:image/gif;base64,R0lGODlhAQABAIAAAAD/AAAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==";
@@ -30,20 +29,23 @@
         layoutTestController.waitUntilDone();
     }
 
-    setTimeout(function() {
-        update(50, 100, red);
+    function finishTest() {
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+	}
 
-        setTimeout(function() {
-            if (window.layoutTestController)
-                layoutTestController.display();
+    function nextStep() {
+        if (window.layoutTestController)
+            layoutTestController.display();
 
-            update(200, 50, green);
+        i._onload_ = function() { setTimeout(finishTest, 0); };
+        update(200, 50, green);
+    }
 
-            setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 0);
-        }, 0);
-    }, 0);
+    function runTest() {
+        i._onload_ = function() { setTimeout(nextStep, 0); };
+        update(50, 100, red);
+    }
+	setTimeout(runTest, 0);
 </script>
 </svg>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to