Changeset 168616 in webkit


Ignore:
Timestamp:
May 12, 2014 2:20:13 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Blending] Adjust blending pixel test expectations
​https://bugs.webkit.org/show_bug.cgi?id=132737

Patch by Ion Rosca <Ion Rosca> 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:
Location:
trunk/LayoutTests
Files:
13 added
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r168599 r168616  
     12014-05-12  Ion Rosca  <rosca@adobe.com>
     2
     3        [CSS Blending] Adjust blending pixel test expectations
     4        https://bugs.webkit.org/show_bug.cgi?id=132737
     5
     6        Reviewed by Mihnea Ovidenie.
     7
     8        Changing failing gif file with with one pixel base64 data and make them different for the two tests,
     9        otherwise they might get cached and the gif animation is shared among multiple tests.
     10        Changing the incorrect expectations for *gif-color-2* and adjusting test expectation for *gif-color-1*
     11        * css3/blending/background-blend-mode-gif-color-2.html:
     12        * css3/blending/background-blend-mode-gif-color.html:
     13        * css3/blending/resources/squares.gif: Removed.
     14        * platform/mac/css3/blending/background-blend-mode-gif-color-2-expected.png:
     15        * platform/mac/css3/blending/background-blend-mode-gif-color-expected.png:
     16 
     17        * platform/mac-wk1/TestExpectations:
     18        The background-blend-mode-gif-color-2 does not pass on WK1: the git animation doesn't get started.
     19
     20        * platform/mac/TestExpectations: Adding bugs to the excepted blending tests.
     21
     22        Adjusting this test to avoid scrollbars. Adjusting test expectations.
     23        * css3/blending/blend-mode-overflow-expected.txt: Removed.
     24        * css3/blending/blend-mode-overflow.html:
     25        * platform/mac/css3/blending/blend-mode-overflow-expected.png:
     26        * platform/mac/css3/blending/blend-mode-overflow-expected.txt:
     27       
     28        Adding pixel expectations for newly added tests:
     29        * platform/mac/css3/blending/blend-mode-isolation-flags-append-non-stacking-context-blending-expected.png: Added.
     30        * platform/mac/css3/blending/blend-mode-isolation-flags-append-stacking-context-blending-expected.png: Added.
     31        * platform/mac/css3/blending/blend-mode-isolation-flags-remove-non-stacking-context-blending-expected.png: Added.
     32        * platform/mac/css3/blending/blend-mode-isolation-flags-remove-stacking-context-blending-expected.png: Added.
     33        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-expected.png: Added.
     34        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-blending-no-isolation-expected.png: Added.
     35        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-off-stacking-context-expected.png: Added.
     36        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-blending-expected.png: Added.
     37        * platform/mac/css3/blending/blend-mode-isolation-flags-turn-on-stacking-context-expected.png: Added.
     38        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer-expected.png: Added.
     39        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer1-expected.png: Added.
     40        * platform/mac/css3/blending/blend-mode-isolation-turn-off-self-painting-layer2-expected.png: Added.
     41        * platform/mac/css3/blending/blend-mode-isolation-turn-on-self-painting-layer-expected.png: Added.
     42
     43        Adjusting pixel tests after removing non separable blend modes.
     44        * platform/mac/css3/blending/blend-mode-simple-composited-expected.png:
     45        * platform/mac/css3/blending/blend-mode-simple-expected.png:
     46        * platform/mac/css3/blending/effect-background-blend-mode-expected.png:
     47        * platform/mac/css3/blending/effect-background-blend-mode-tiled-expected.png:
     48
    1492014-05-09  Myles C. Maxfield  <litherum@gmail.com>
    250

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

    r168354 r168616  
    66        width: 130px;
    77        height: 130px;
    8         background: url('resources/squares.gif'), green;
     8        background-color: green;
    99        float: left;
    1010        margin: 5px;
    … …  
    1515        window.testRunner.waitUntilDone();
    1616
    17     function done() {
    18         if (window.testRunner)
    19             window.testRunner.notifyDone();
    20     }
     17    var blueWhite1px400msGif = "url('data:image/gif;base64,R0lGODlhAQABAJECAP///wAt0v///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJKAACACwAAAAAAQABAAACAkwBACH5BAkoAAIALAAAAAABAAEAAAICRAEAOw==')";
    2118
     19    window.onload = function () {
     20        var list = document.getElementsByTagName('div');
     21        for (var i = 0; i < list.length; i++)
     22            list[i].style.backgroundImage = blueWhite1px400msGif;
     23        setTimeout(function () {
     24            if (window.testRunner)
     25                window.testRunner.notifyDone();
     26        }, 500);
     27    };
    2228</script>
    2329</head>
    … …  
    3541    <div style="background-blend-mode: difference, normal"></div>
    3642    <div style="background-blend-mode: exclusion, normal"></div>
    37     <script type="text/javascript">
    38         window.setTimeout("done()", 400);
    39     </script>
    4043</body>
    4144</html>

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

    r168354 r168616  
    66        width: 130px;
    77        height: 130px;
    8         background: url('resources/squares.gif'), green;
     8        background-color: green;
    99        float: left;
    1010        margin: 5px;
    1111    }
    1212</style>
     13<script type="text/javascript">
     14    if (window.testRunner)
     15        window.testRunner.waitUntilDone();
     16
     17    var greenWhite1px400msGif = "url('data:image/gif;base64,R0lGODlhAQABAJECAAB/Jv///////wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJKAACACwAAAAAAQABAAACAkQBACH5BAkoAAIALAAAAAABAAEAAAICTAEAOw==')";
     18
     19    window.onload = function () {
     20        var list = document.getElementsByTagName('div');
     21        for (var i = 0; i < list.length; i++)
     22            list[i].style.backgroundImage = greenWhite1px400msGif;
     23        setTimeout(function () {
     24            if (window.testRunner)
     25                window.testRunner.notifyDone();
     26        }, 0);
     27    };
     28</script>
    1329</head>
    1430<!-- This file should contain a gif on top of a background color with every type of blending. -->

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

    r168472 r168616  
    11<!DOCTYPE HTML>
    22<head>
    3     <script>
    4         if (window.testRunner) {
    5             window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
    6             window.testRunner.dumpAsText(true);
    7         }
    8     </script>
    9 
    103    <style>
    114        .example {
    12             width: 200px;
    13             height: 200px;
     5            width: 180px;
     6            height: 180px;
    147            display: inline-block;
    158        }

  • trunk/LayoutTests/platform/mac-wk1/TestExpectations

    r167827 r168616  
    3636# Fails with WebKit1 only.
    3737editing/secure-input/reset-state-on-navigation.html [ Failure ]
     38css3/blending/background-blend-mode-gif-color-2.html [ ImageOnlyFailure Pass ]
    3839
    3940# Plug-in blocking callback doesn't exist in WebKit1.

  • trunk/LayoutTests/platform/mac/TestExpectations

    r168580 r168616  
    590590
    591591# Blend mode result is slightly different than the applied formula.
    592 css3/blending/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
    593 css3/blending/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
    594 css3/blending/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
     592webkit.org/b/130582 css3/blending/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
     593webkit.org/b/130582 css3/blending/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
     594webkit.org/b/130582 css3/blending/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
    595595
    596596# https://bugs.webkit.org/show_bug.cgi?id=110871

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

    r168354 r168616  
    1 No blending. Duck should be yellow everywhere.
    2 Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow.
    3 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).
    4 Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow.
    5 Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on overflow.
    6 Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden.
    7  
    8  
    9 
    10  
    11  
    12 
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x576 isolatesBlending
     4  RenderBlock {HTML} at (0,0) size 800x576
     5    RenderBody {BODY} at (8,16) size 784x544
     6      RenderBlock {UL} at (0,0) size 784x544
     7        RenderBlock {OL} at (40,0) size 744x144
     8          RenderListItem {LI} at (40,0) size 704x18
     9            RenderListMarker at (-20,0) size 16x18: "1"
     10            RenderText {#text} at (0,0) size 316x18
     11              text run at (0,0) width 316: "No blending. Duck should be yellow everywhere."
     12          RenderListItem {LI} at (40,18) size 704x18
     13            RenderListMarker at (-20,0) size 16x18: "2"
     14            RenderText {#text} at (0,0) size 533x18
     15              text run at (0,0) width 533: "Simple blending. Duck should be a horizontal rainbow inside, and blue on overflow."
     16          RenderListItem {LI} at (40,36) size 704x36
     17            RenderListMarker at (-20,0) size 16x18: "3"
     18            RenderText {#text} at (0,0) size 703x36
     19              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"
     20              text run at (0,18) width 226: "no background there to blend with)."
     21          RenderListItem {LI} at (40,72) size 704x18
     22            RenderListMarker at (-20,0) size 16x18: "4"
     23            RenderText {#text} at (0,0) size 668x18
     24              text run at (0,0) width 668: "Intermediate parent - no stacking context. Duck should be a vertical gradient inside, and blue on overflow."
     25          RenderListItem {LI} at (40,90) size 704x36
     26            RenderListMarker at (-20,0) size 16x18: "5"
     27            RenderText {#text} at (0,0) size 701x36
     28              text run at (0,0) width 701: "Intermediate parent with grandparent stacking context. Duck should be a vertical gradient inside, and yellow on"
     29              text run at (0,18) width 61: "overflow."
     30          RenderListItem {LI} at (40,126) size 704x18
     31            RenderListMarker at (-20,0) size 16x18: "6"
     32            RenderText {#text} at (0,0) size 629x18
     33              text run at (0,0) width 629: "Intermediate parent has overflow. Duck should be a vertical gradient inside, and overflow is hidden."
     34        RenderBlock (anonymous) at (40,176) size 744x368
     35          RenderBlock {DIV} at (0,0) size 180x180
     36          RenderText {#text} at (180,166) size 4x18
     37            text run at (180,166) width 4: " "
     38          RenderText {#text} at (0,0) size 0x0
     39          RenderBlock {DIV} at (184,0) size 180x180
     40          RenderText {#text} at (364,166) size 4x18
     41            text run at (364,166) width 4: " "
     42          RenderText {#text} at (0,0) size 0x0
     43          RenderBlock {DIV} at (368,0) size 180x180
     44          RenderText {#text} at (548,166) size 4x18
     45            text run at (548,166) width 4: " "
     46          RenderText {#text} at (0,0) size 0x0
     47          RenderBlock {DIV} at (552,0) size 180x180
     48          RenderText {#text} at (0,0) size 0x0
     49          RenderText {#text} at (0,0) size 0x0
     50          RenderBlock {DIV} at (0,184) size 180x180
     51          RenderText {#text} at (180,350) size 4x18
     52            text run at (180,350) width 4: " "
     53          RenderText {#text} at (0,0) size 0x0
     54          RenderBlock {DIV} at (184,184) size 180x180
     55          RenderText {#text} at (0,0) size 0x0
     56layer at (48,192) size 150x150
     57  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     58layer at (68,212) size 150x150
     59  RenderImage {IMG} at (20,20) size 150x150
     60layer at (232,192) size 150x150
     61  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     62layer at (252,212) size 150x150 blendMode: difference
     63  RenderImage {IMG} at (20,20) size 150x150
     64layer at (416,192) size 150x150 isolatesBlending
     65  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     66layer at (436,212) size 150x150 blendMode: difference
     67  RenderImage {IMG} at (20,20) size 150x150
     68layer at (600,192) size 150x150
     69  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     70layer at (610,202) size 150x150
     71  RenderBlock (positioned) {DIV} at (10,10) size 150x150
     72layer at (630,222) size 150x150 blendMode: difference
     73  RenderImage {IMG} at (20,20) size 150x150
     74layer at (48,376) size 150x150 isolatesBlending
     75  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     76layer at (58,386) size 150x150
     77  RenderBlock (positioned) {DIV} at (10,10) size 150x150
     78layer at (78,406) size 150x150 blendMode: difference
     79  RenderImage {IMG} at (20,20) size 150x150
     80layer at (232,376) size 150x150 isolatesBlending
     81  RenderBlock (relative positioned) {DIV} at (0,0) size 150x150
     82layer at (242,386) size 150x150 scrollWidth 170 scrollHeight 170
     83  RenderBlock (positioned) {DIV} at (10,10) size 150x150
     84layer 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
     85  RenderImage {IMG} at (20,20) size 150x150
Note: See TracChangeset for help on using the changeset viewer.