[CSS Blending] Adjust blending pixel test expectations

https://bugs.webkit.org/show_bug.cgi?id=132737

Patch by Ion Rosca <rosca@adobe.com> on 2014-05-12
Reviewed by Mihnea Ovidenie.

Changing failing gif file with with one pixel base64 data and make them different for the two tests,
otherwise they might get cached and the gif animation is shared among multiple tests.
Changing the incorrect expectations for *gif-color-2* and adjusting test expectation for *gif-color-1*
* css3/blending/background-blend-mode-gif-color-2.html:
* css3/blending/background-blend-mode-gif-color.html:
* css3/blending/resources/squares.gif: Removed.
* platform/mac/css3/blending/background-blend-mode-gif-color-2-expected.png:
* platform/mac/css3/blending/background-blend-mode-gif-color-expected.png:

* platform/mac-wk1/TestExpectations:
The background-blend-mode-gif-color-2 does not pass on WK1: the git animation doesn't get started.

* platform/mac/TestExpectations: Adding bugs to the excepted blending tests.

Adjusting this test to avoid scrollbars. Adjusting test expectations.
* css3/blending/blend-mode-overflow-expected.txt: Removed.
* css3/blending/blend-mode-overflow.html:
* platform/mac/css3/blending/blend-mode-overflow-expected.png:
* platform/mac/css3/blending/blend-mode-overflow-expected.txt:

Adding pixel expectations for newly added tests:
* platform/mac/css3/blending/blend-mode-isolation-flags-append-non-stacking-context-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-append-stacking-context-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-remove-non-stacking-context-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-remove-stacking-context-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-no-isolation-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-stacking-context-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-blending-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-stacking-context-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer1-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer2-expected.png: Added.
* platform/mac/css3/blending/blend-mode-isolation-turn-on-self-painting-layer-expected.png: Added.

Adjusting pixel tests after removing non separable blend modes.
* platform/mac/css3/blending/blend-mode-simple-composited-expected.png:
* platform/mac/css3/blending/blend-mode-simple-expected.png:
* platform/mac/css3/blending/effect-background-blend-mode-expected.png:
* platform/mac/css3/blending/effect-background-blend-mode-tiled-expected.png:

Canonical link: https://commits.webkit.org/150858@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,51 @@
+2014-05-12  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Adjust blending pixel test expectations
+        https://bugs.webkit.org/show_bug.cgi?id=132737
+
+        Reviewed by Mihnea Ovidenie.
+
+        Changing failing gif file with with one pixel base64 data and make them different for the two tests,
+        otherwise they might get cached and the gif animation is shared among multiple tests.
+        Changing the incorrect expectations for *gif-color-2* and adjusting test expectation for *gif-color-1*
+        * css3/blending/background-blend-mode-gif-color-2.html:
+        * css3/blending/background-blend-mode-gif-color.html:
+        * css3/blending/resources/squares.gif: Removed.
+        * platform/mac/css3/blending/background-blend-mode-gif-color-2-expected.png:
+        * platform/mac/css3/blending/background-blend-mode-gif-color-expected.png:
+
+        * platform/mac-wk1/TestExpectations:
+        The background-blend-mode-gif-color-2 does not pass on WK1: the git animation doesn't get started.
+
+        * platform/mac/TestExpectations: Adding bugs to the excepted blending tests.
+
+        Adjusting this test to avoid scrollbars. Adjusting test expectations.
+        * css3/blending/blend-mode-overflow-expected.txt: Removed.
+        * css3/blending/blend-mode-overflow.html:
+        * platform/mac/css3/blending/blend-mode-overflow-expected.png:
+        * platform/mac/css3/blending/blend-mode-overflow-expected.txt:
+
+        Adding pixel expectations for newly added tests:
+        * platform/mac/css3/blending/blend-mode-isolation-flags-append-non-stacking-context-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-append-stacking-context-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-remove-non-stacking-context-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-remove-stacking-context-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-no-isolation-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-stacking-context-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-blending-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-stacking-context-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer1-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer2-expected.png: Added.
+        * platform/mac/css3/blending/blend-mode-isolation-turn-on-self-painting-layer-expected.png: Added.
+
+        Adjusting pixel tests after removing non separable blend modes.
+        * platform/mac/css3/blending/blend-mode-simple-composited-expected.png:
+        * platform/mac/css3/blending/blend-mode-simple-expected.png:
+        * platform/mac/css3/blending/effect-background-blend-mode-expected.png:
+        * platform/mac/css3/blending/effect-background-blend-mode-tiled-expected.png:
+
 2014-05-09  Myles C. Maxfield  <litherum@gmail.com>
 
         [Mac] [iOS] Underlines are too low

LayoutTests/css3/blending/background-blend-mode-gif-color-2.html

@@ -5,7 +5,7 @@
     div {
         width: 130px;
         height: 130px;
-        background: url('resources/squares.gif'), green;
+        background-color: green;
         float: left;
         margin: 5px;
     }
@@ -14,11 +14,17 @@
     if (window.testRunner)
         window.testRunner.waitUntilDone();
 
-    function done() {
-        if (window.testRunner)
-            window.testRunner.notifyDone();
-    }
+    var blueWhite1px400msGif = "url('data:image/gif;base64,R0lGODlhAQABAJECAP///wAt0v///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJKAACACwAAAAAAQABAAACAkwBACH5BAkoAAIALAAAAAABAAEAAAICRAEAOw==')";
 
+    window.onload = function () {
+        var list = document.getElementsByTagName('div');
+        for (var i = 0; i < list.length; i++)
+            list[i].style.backgroundImage = blueWhite1px400msGif;
+        setTimeout(function () {
+            if (window.testRunner)
+                window.testRunner.notifyDone();
+        }, 500);
+    };
 </script>
 </head>
 <!-- This file should contain a gif on top of a background color with every type of blending. -->
@@ -34,8 +40,5 @@
     <div style="background-blend-mode: soft-light, normal"></div>
     <div style="background-blend-mode: difference, normal"></div>
     <div style="background-blend-mode: exclusion, normal"></div>
-    <script type="text/javascript">
-        window.setTimeout("done()", 400);
-    </script>
 </body>
 </html>

LayoutTests/css3/blending/background-blend-mode-gif-color.html

@@ -5,11 +5,27 @@
     div {
         width: 130px;
         height: 130px;
-        background: url('resources/squares.gif'), green;
+        background-color: green;
         float: left;
         margin: 5px;
     }
 </style>
+<script type="text/javascript">
+    if (window.testRunner)
+        window.testRunner.waitUntilDone();
+
+    var greenWhite1px400msGif = "url('data:image/gif;base64,R0lGODlhAQABAJECAAB/Jv///////wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJKAACACwAAAAAAQABAAACAkQBACH5BAkoAAIALAAAAAABAAEAAAICTAEAOw==')";
+
+    window.onload = function () {
+        var list = document.getElementsByTagName('div');
+        for (var i = 0; i < list.length; i++)
+            list[i].style.backgroundImage = greenWhite1px400msGif;
+        setTimeout(function () {
+            if (window.testRunner)
+                window.testRunner.notifyDone();
+        }, 0);
+    };
+</script>
 </head>
 <!-- This file should contain a gif on top of a background color with every type of blending. -->
 <body>

LayoutTests/css3/blending/blend-mode-overflow.html

@@ -1,16 +1,9 @@
 <!DOCTYPE HTML>
 <head>
-    <script>
-        if (window.testRunner) {
-            window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
-            window.testRunner.dumpAsText(true);
-        }
-    </script>
-
     <style>
         .example {
-            width: 200px;
-            height: 200px;
+            width: 180px;
+            height: 180px;
             display: inline-block;
         }
 

LayoutTests/platform/mac-wk1/TestExpectations

@@ -35,6 +35,7 @@ crypto/subtle/rsa-indexeddb.html
 
 # Fails with WebKit1 only.
 editing/secure-input/reset-state-on-navigation.html [ Failure ]
+css3/blending/background-blend-mode-gif-color-2.html [ ImageOnlyFailure Pass ]
 
 # Plug-in blocking callback doesn't exist in WebKit1.
 plugins/unavailable-plugin-indicator-obscurity.html

LayoutTests/platform/mac/TestExpectations

@@ -589,9 +589,9 @@ compositing/overflow/updating-scrolling-content.html
 compositing/overflow/scrolling-without-painting.html
 
 # Blend mode result is slightly different than the applied formula.
-css3/blending/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
-css3/blending/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
-css3/blending/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
+webkit.org/b/130582 css3/blending/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
+webkit.org/b/130582 css3/blending/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
+webkit.org/b/130582 css3/blending/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
 
 # https://bugs.webkit.org/show_bug.cgi?id=110871
 compositing/overlap-blending/reflection-opacity-huge.html

LayoutTests/platform/mac/css3/blending/blend-mode-overflow-expected.txt

@@ -1,12 +1,85 @@
-No blending. Duck should be yellow everywhere.
-Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow.
-Parent is a stacking context. Duck should be a horizontal rainbow inside, and yellow on overflow (since there is no background there to blend with).
-Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow.
-Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on overflow.
-Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden.
-
-
-
-
-
-
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x576 isolatesBlending
+  RenderBlock {HTML} at (0,0) size 800x576
+    RenderBody {BODY} at (8,16) size 784x544
+      RenderBlock {UL} at (0,0) size 784x544
+        RenderBlock {OL} at (40,0) size 744x144
+          RenderListItem {LI} at (40,0) size 704x18
+            RenderListMarker at (-20,0) size 16x18: "1"
+            RenderText {#text} at (0,0) size 316x18
+              text run at (0,0) width 316: "No blending. Duck should be yellow everywhere."
+          RenderListItem {LI} at (40,18) size 704x18
+            RenderListMarker at (-20,0) size 16x18: "2"
+            RenderText {#text} at (0,0) size 533x18
+              text run at (0,0) width 533: "Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow."
+          RenderListItem {LI} at (40,36) size 704x36
+            RenderListMarker at (-20,0) size 16x18: "3"
+            RenderText {#text} at (0,0) size 703x36
+              text run at (0,0) width 703: "Parent is a stacking context. Duck should be a horizontal rainbow inside, and yellow on overflow (since there is"
+              text run at (0,18) width 226: "no background there to blend with)."
+          RenderListItem {LI} at (40,72) size 704x18
+            RenderListMarker at (-20,0) size 16x18: "4"
+            RenderText {#text} at (0,0) size 668x18
+              text run at (0,0) width 668: "Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow."
+          RenderListItem {LI} at (40,90) size 704x36
+            RenderListMarker at (-20,0) size 16x18: "5"
+            RenderText {#text} at (0,0) size 701x36
+              text run at (0,0) width 701: "Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on"
+              text run at (0,18) width 61: "overflow."
+          RenderListItem {LI} at (40,126) size 704x18
+            RenderListMarker at (-20,0) size 16x18: "6"
+            RenderText {#text} at (0,0) size 629x18
+              text run at (0,0) width 629: "Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden."
+        RenderBlock (anonymous) at (40,176) size 744x368
+          RenderBlock {DIV} at (0,0) size 180x180
+          RenderText {#text} at (180,166) size 4x18
+            text run at (180,166) width 4: " "
+          RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (184,0) size 180x180
+          RenderText {#text} at (364,166) size 4x18
+            text run at (364,166) width 4: " "
+          RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (368,0) size 180x180
+          RenderText {#text} at (548,166) size 4x18
+            text run at (548,166) width 4: " "
+          RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (552,0) size 180x180
+          RenderText {#text} at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (0,184) size 180x180
+          RenderText {#text} at (180,350) size 4x18
+            text run at (180,350) width 4: " "
+          RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (184,184) size 180x180
+          RenderText {#text} at (0,0) size 0x0
+layer at (48,192) size 150x150
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (68,212) size 150x150
+  RenderImage {IMG} at (20,20) size 150x150
+layer at (232,192) size 150x150
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (252,212) size 150x150 blendMode: difference
+  RenderImage {IMG} at (20,20) size 150x150
+layer at (416,192) size 150x150 isolatesBlending
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (436,212) size 150x150 blendMode: difference
+  RenderImage {IMG} at (20,20) size 150x150
+layer at (600,192) size 150x150
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (610,202) size 150x150
+  RenderBlock (positioned) {DIV} at (10,10) size 150x150
+layer at (630,222) size 150x150 blendMode: difference
+  RenderImage {IMG} at (20,20) size 150x150
+layer at (48,376) size 150x150 isolatesBlending
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (58,386) size 150x150
+  RenderBlock (positioned) {DIV} at (10,10) size 150x150
+layer at (78,406) size 150x150 blendMode: difference
+  RenderImage {IMG} at (20,20) size 150x150
+layer at (232,376) size 150x150 isolatesBlending
+  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
+layer at (242,386) size 150x150 scrollWidth 170 scrollHeight 170
+  RenderBlock (positioned) {DIV} at (10,10) size 150x150
+layer at (262,406) size 150x150 backgroundClip at (242,386) size 150x150 clip at (242,386) size 150x150 outlineClip at (242,386) size 150x150 blendMode: difference
+  RenderImage {IMG} at (20,20) size 150x150