Changeset 164480 in webkit


Ignore:
Timestamp:
Feb 21, 2014 1:19:16 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Blending] Refactor -webkit-blend-mode to -webkit-mix-blend-mode
​https://bugs.webkit.org/show_bug.cgi?id=128805

Patch by Mihai Tica <​mitica@adobe.com> on 2014-02-21
Reviewed by Dean Jackson.

Source/WebCore:

The spec defines the mix-blend-mode property. This means that the
prefixed version should be -webkit-mix-blend-mode, instead of
-webkit-blend-mode.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):

  • css/CSSPropertyNames.in:
  • css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

LayoutTests:

The spec defines the mix-blend-mode property. This means that the
prefixed version should be -webkit-mix-blend-mode, instead of
-webkit-blend-mode. Update all tests accordingly.

  • css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html:
  • css3/compositing/blend-mode-layers.html:
  • css3/compositing/blend-mode-overflow.html:
  • css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html:
  • css3/compositing/blend-mode-property-expected.txt:
  • css3/compositing/blend-mode-property-parsing-expected.txt:
  • css3/compositing/blend-mode-property-parsing-invalid-expected.txt:
  • css3/compositing/blend-mode-reflection.html:
  • css3/compositing/blend-mode-simple-composited.html:
  • css3/compositing/blend-mode-simple.html:
  • css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html:
  • css3/compositing/resources/red-circle.svg:
  • css3/compositing/script-tests/blend-mode-property-parsing-invalid.js:

(testInvalidFilterRule):

  • css3/compositing/script-tests/blend-mode-property-parsing.js:

(testBlendModeRule):

  • css3/compositing/script-tests/blend-mode-property.js:

(testblendmode):

  • css3/compositing/svg-blend-color-burn.html:
  • css3/compositing/svg-blend-color-dodge.html:
  • css3/compositing/svg-blend-color.html:
  • css3/compositing/svg-blend-darken.html:
  • css3/compositing/svg-blend-difference.html:
  • css3/compositing/svg-blend-exclusion.html:
  • css3/compositing/svg-blend-hard-light.html:
  • css3/compositing/svg-blend-hue.html:
  • css3/compositing/svg-blend-layer-blend.html:
  • css3/compositing/svg-blend-layer-clip-path.html:
  • css3/compositing/svg-blend-layer-filter.html:
  • css3/compositing/svg-blend-layer-mask.html:
  • css3/compositing/svg-blend-layer-opacity.html:
  • css3/compositing/svg-blend-layer-shadow.html:
  • css3/compositing/svg-blend-lighten.html:
  • css3/compositing/svg-blend-luminosity.html:
  • css3/compositing/svg-blend-multiply-alpha.html:
  • css3/compositing/svg-blend-multiply.html:
  • css3/compositing/svg-blend-normal.html:
  • css3/compositing/svg-blend-overlay.html:
  • css3/compositing/svg-blend-saturation.html:
  • css3/compositing/svg-blend-screen.html:
  • css3/compositing/svg-blend-soft-light.html:
  • transitions/blendmode-transitions-expected.txt:
  • transitions/blendmode-transitions.html:
Location:
trunk
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r164477 r164480  
     12014-02-21  Mihai Tica  <mitica@adobe.com>
     2
     3        [CSS Blending] Refactor -webkit-blend-mode to -webkit-mix-blend-mode
     4        https://bugs.webkit.org/show_bug.cgi?id=128805
     5
     6        Reviewed by Dean Jackson.
     7
     8        The spec defines the mix-blend-mode property. This means that the
     9        prefixed version should be -webkit-mix-blend-mode, instead of
     10        -webkit-blend-mode. Update all tests accordingly.
     11
     12        * css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html:
     13        * css3/compositing/blend-mode-layers.html:
     14        * css3/compositing/blend-mode-overflow.html:
     15        * css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html:
     16        * css3/compositing/blend-mode-property-expected.txt:
     17        * css3/compositing/blend-mode-property-parsing-expected.txt:
     18        * css3/compositing/blend-mode-property-parsing-invalid-expected.txt:
     19        * css3/compositing/blend-mode-reflection.html:
     20        * css3/compositing/blend-mode-simple-composited.html:
     21        * css3/compositing/blend-mode-simple.html:
     22        * css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html:
     23        * css3/compositing/resources/red-circle.svg:
     24        * css3/compositing/script-tests/blend-mode-property-parsing-invalid.js:
     25        (testInvalidFilterRule):
     26        * css3/compositing/script-tests/blend-mode-property-parsing.js:
     27        (testBlendModeRule):
     28        * css3/compositing/script-tests/blend-mode-property.js:
     29        (testblendmode):
     30        * css3/compositing/svg-blend-color-burn.html:
     31        * css3/compositing/svg-blend-color-dodge.html:
     32        * css3/compositing/svg-blend-color.html:
     33        * css3/compositing/svg-blend-darken.html:
     34        * css3/compositing/svg-blend-difference.html:
     35        * css3/compositing/svg-blend-exclusion.html:
     36        * css3/compositing/svg-blend-hard-light.html:
     37        * css3/compositing/svg-blend-hue.html:
     38        * css3/compositing/svg-blend-layer-blend.html:
     39        * css3/compositing/svg-blend-layer-clip-path.html:
     40        * css3/compositing/svg-blend-layer-filter.html:
     41        * css3/compositing/svg-blend-layer-mask.html:
     42        * css3/compositing/svg-blend-layer-opacity.html:
     43        * css3/compositing/svg-blend-layer-shadow.html:
     44        * css3/compositing/svg-blend-lighten.html:
     45        * css3/compositing/svg-blend-luminosity.html:
     46        * css3/compositing/svg-blend-multiply-alpha.html:
     47        * css3/compositing/svg-blend-multiply.html:
     48        * css3/compositing/svg-blend-normal.html:
     49        * css3/compositing/svg-blend-overlay.html:
     50        * css3/compositing/svg-blend-saturation.html:
     51        * css3/compositing/svg-blend-screen.html:
     52        * css3/compositing/svg-blend-soft-light.html:
     53        * transitions/blendmode-transitions-expected.txt:
     54        * transitions/blendmode-transitions.html:
     55
    1562014-02-20  ChangSeok Oh  <changseok.oh@collabora.com>
    257

  • trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer.html

    r163955 r164480  
    1313    .blender {
    1414        margin-top: -30px;
    15         -webkit-blend-mode: difference;
     15        -webkit-mix-blend-mode: difference;
    1616    }
    1717</style>

  • trunk/LayoutTests/css3/compositing/blend-mode-layers.html

    r163955 r164480  
    6161
    6262        <!-- setting the blendmode will create a new stacking context which causes z-index to change -->
    63         <li><div class="div1"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
    64         <li><div class="div1"><div class="div2 composited" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
     63        <li><div class="div1"><div class="div2" style="-webkit-mix-blend-mode: multiply"><div class="div3"></div></div></div></li>
     64        <li><div class="div1"><div class="div2 composited" style="-webkit-mix-blend-mode: multiply"><div class="div3"></div></div></div></li>
    6565
    6666        <!-- just setting slight opacity which causes a stacking context. This also causes z-index to be resolved to the stacking context -->
    … …  
    6868
    6969        <!-- blending will now only happen upto the stacking context generated by opacity. Z-index is resolved against the stacking context of the div with the blendmode -->
    70         <li><div class="div1" style="opacity:.99"><div class="div2" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
    71         <li><div class="div1" style="opacity:.99"><div class="div2 composited" style="-webkit-blend-mode: multiply"><div class="div3"></div></div></div></li>
     70        <li><div class="div1" style="opacity:.99"><div class="div2" style="-webkit-mix-blend-mode: multiply"><div class="div3"></div></div></div></li>
     71        <li><div class="div1" style="opacity:.99"><div class="div2 composited" style="-webkit-mix-blend-mode: multiply"><div class="div3"></div></div></div></li>
    7272    </ul>
    7373</body>

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

    r161628 r164480  
    6565        <div class="example">
    6666            <div class="blendingbg">
    67                 <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
     67                <img src="resources/ducky.png" style="-webkit-mix-blend-mode: difference;">
    6868            </div>
    6969        </div>
    … …  
    7272        <div class="example">
    7373            <div class="blendingbg" style="-webkit-transform: translateZ(0)">
    74                 <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
     74                <img src="resources/ducky.png" style="-webkit-mix-blend-mode: difference;">
    7575            </div>
    7676        </div>
    … …  
    8080            <div class="blendingbg">
    8181                <div class="intermediate">
    82                     <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
     82                    <img src="resources/ducky.png" style="-webkit-mix-blend-mode: difference;">
    8383                </div>
    8484            </div>
    … …  
    8989            <div class="blendingbg" style="-webkit-transform: translateZ(0)">
    9090                <div class="intermediate">
    91                     <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
     91                    <img src="resources/ducky.png" style="-webkit-mix-blend-mode: difference;">
    9292                </div>
    9393            </div>
    … …  
    9898            <div class="blendingbg" style="-webkit-transform: translateZ(0)">
    9999                <div class="intermediate" style="overflow: hidden">
    100                     <img src="resources/ducky.png" style="-webkit-blend-mode: difference;">
     100                    <img src="resources/ducky.png" style="-webkit-mix-blend-mode: difference;">
    101101                </div>
    102102            </div>

  • trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer.html

    r163955 r164480  
    88    }
    99    .blender {
    10         -webkit-blend-mode: difference;
     10        -webkit-mix-blend-mode: difference;
    1111        -webkit-transform: translateZ(0);
    1212        margin: 10px;

  • trunk/LayoutTests/css3/compositing/blend-mode-property-expected.txt

    r130460 r164480  
    1 Test the parsing of the -webkit-blend-mode property.
     1Test the parsing of the -webkit-mix-blend-mode property.
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    … …  
    66PASS cssRule.type is 1
    77PASS declaration.length is 1
    8 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'normal'
     8PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'normal'
    99PASS cssRule.type is 1
    1010PASS declaration.length is 1
    11 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'multiply'
     11PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'multiply'
    1212PASS cssRule.type is 1
    1313PASS declaration.length is 1
    14 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'screen'
     14PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'screen'
    1515PASS cssRule.type is 1
    1616PASS declaration.length is 1
    17 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'overlay'
     17PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'overlay'
    1818PASS cssRule.type is 1
    1919PASS declaration.length is 1
    20 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'darken'
     20PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'darken'
    2121PASS cssRule.type is 1
    2222PASS declaration.length is 1
    23 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'lighten'
     23PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'lighten'
    2424PASS cssRule.type is 1
    2525PASS declaration.length is 1
    26 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color-dodge'
     26PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color-dodge'
    2727PASS cssRule.type is 1
    2828PASS declaration.length is 1
    29 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color-burn'
     29PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color-burn'
    3030PASS cssRule.type is 1
    3131PASS declaration.length is 1
    32 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'hard-light'
     32PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'hard-light'
    3333PASS cssRule.type is 1
    3434PASS declaration.length is 1
    35 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'soft-light'
     35PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'soft-light'
    3636PASS cssRule.type is 1
    3737PASS declaration.length is 1
    38 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'difference'
     38PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'difference'
    3939PASS cssRule.type is 1
    4040PASS declaration.length is 1
    41 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'exclusion'
     41PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'exclusion'
    4242PASS cssRule.type is 1
    4343PASS declaration.length is 1
    44 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'hue'
     44PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'hue'
    4545PASS cssRule.type is 1
    4646PASS declaration.length is 1
    47 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'saturation'
     47PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'saturation'
    4848PASS cssRule.type is 1
    4949PASS declaration.length is 1
    50 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color'
     50PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color'
    5151PASS cssRule.type is 1
    5252PASS declaration.length is 1
    53 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'luminosity'
     53PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'luminosity'
    5454PASS successfullyParsed is true
    5555

  • trunk/LayoutTests/css3/compositing/blend-mode-property-parsing-expected.txt

    r130460 r164480  
    1 Test the parsing of the -webkit-blend-mode property.
     1Test the parsing of the -webkit-mix-blend-mode property.
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    … …  
    88PASS cssRule.type is 1
    99PASS declaration.length is 1
    10 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'normal'
     10PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'normal'
    1111PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    1212PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    1616PASS cssRule.type is 1
    1717PASS declaration.length is 1
    18 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'multiply'
     18PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'multiply'
    1919PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    2020PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    2424PASS cssRule.type is 1
    2525PASS declaration.length is 1
    26 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'screen'
     26PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'screen'
    2727PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    2828PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    3232PASS cssRule.type is 1
    3333PASS declaration.length is 1
    34 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'overlay'
     34PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'overlay'
    3535PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    3636PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    4040PASS cssRule.type is 1
    4141PASS declaration.length is 1
    42 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'darken'
     42PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'darken'
    4343PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    4444PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    4848PASS cssRule.type is 1
    4949PASS declaration.length is 1
    50 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'lighten'
     50PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'lighten'
    5151PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    5252PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    5656PASS cssRule.type is 1
    5757PASS declaration.length is 1
    58 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color-dodge'
     58PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color-dodge'
    5959PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    6060PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    6464PASS cssRule.type is 1
    6565PASS declaration.length is 1
    66 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color-burn'
     66PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color-burn'
    6767PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    6868PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    7272PASS cssRule.type is 1
    7373PASS declaration.length is 1
    74 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'hard-light'
     74PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'hard-light'
    7575PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    7676PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    8080PASS cssRule.type is 1
    8181PASS declaration.length is 1
    82 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'soft-light'
     82PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'soft-light'
    8383PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    8484PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    8888PASS cssRule.type is 1
    8989PASS declaration.length is 1
    90 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'difference'
     90PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'difference'
    9191PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    9292PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    9696PASS cssRule.type is 1
    9797PASS declaration.length is 1
    98 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'exclusion'
     98PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'exclusion'
    9999PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    100100PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    104104PASS cssRule.type is 1
    105105PASS declaration.length is 1
    106 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'hue'
     106PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'hue'
    107107PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    108108PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    112112PASS cssRule.type is 1
    113113PASS declaration.length is 1
    114 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'saturation'
     114PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'saturation'
    115115PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    116116PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    120120PASS cssRule.type is 1
    121121PASS declaration.length is 1
    122 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'color'
     122PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'color'
    123123PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    124124PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
    … …  
    128128PASS cssRule.type is 1
    129129PASS declaration.length is 1
    130 PASS declaration.getPropertyValue('-webkit-blend-mode') is 'luminosity'
     130PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is 'luminosity'
    131131PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
    132132PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'

  • trunk/LayoutTests/css3/compositing/blend-mode-property-parsing-invalid-expected.txt

    r126105 r164480  
    1 Test the parsing of the -webkit-blend-mode property.
     1Test the parsing of the -webkit-mix-blend-mode property.
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    … …  
    88PASS cssRule.type is 1
    99PASS declaration.length is 0
    10 PASS declaration.getPropertyValue('-webkit-blend-mode') is null
     10PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is null
    1111
    1212Wrong type : "5px"
    1313PASS cssRule.type is 1
    1414PASS declaration.length is 0
    15 PASS declaration.getPropertyValue('-webkit-blend-mode') is null
     15PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is null
    1616
    1717Trailing comma : overlay,
    1818PASS cssRule.type is 1
    1919PASS declaration.length is 0
    20 PASS declaration.getPropertyValue('-webkit-blend-mode') is null
     20PASS declaration.getPropertyValue('-webkit-mix-blend-mode') is null
    2121PASS successfullyParsed is true
    2222

  • trunk/LayoutTests/css3/compositing/blend-mode-reflection.html

    r163955 r164480  
    3131Both the duck and the reflection should blend.  -->
    3232<body>
    33     <ul><li><img style="-webkit-blend-mode: multiply" src="resources/ducky.png"></li></ul>
    34     <ul><li><img class="composited" style="-webkit-blend-mode: multiply" src="resources/ducky.png"></li></ul>
     33    <ul><li><img style="-webkit-mix-blend-mode: multiply" src="resources/ducky.png"></li></ul>
     34    <ul><li><img class="composited" style="-webkit-mix-blend-mode: multiply" src="resources/ducky.png"></li></ul>
    3535</body>

  • trunk/LayoutTests/css3/compositing/blend-mode-simple-composited.html

    r163955 r164480  
    2828    <ul>
    2929        <!-- Separable blend modes -->
    30         <li><img style="-webkit-blend-mode: normal" src="resources/ducky.png"></li>
    31         <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
    32         <li><img style="-webkit-blend-mode: screen" src="resources/ducky.png"></li>
    33         <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
    34         <li><img style="-webkit-blend-mode: darken" src="resources/ducky.png"></li>
    35         <li><img style="-webkit-blend-mode: lighten" src="resources/ducky.png"></li>
    36         <li><img style="-webkit-blend-mode: color-dodge" src="resources/ducky.png"></li>
    37         <li><img style="-webkit-blend-mode: color-burn" src="resources/ducky.png"></li>
    38         <li><img style="-webkit-blend-mode: hard-light" src="resources/ducky.png"></li>
    39         <li><img style="-webkit-blend-mode: soft-light" src="resources/ducky.png"></li>
    40         <li><img style="-webkit-blend-mode: difference" src="resources/ducky.png"></li>
    41         <li><img style="-webkit-blend-mode: exclusion" src="resources/ducky.png"></li>
     30        <li><img style="-webkit-mix-blend-mode: normal" src="resources/ducky.png"></li>
     31        <li><img style="-webkit-mix-blend-mode: overlay" src="resources/ducky.png"></li>
     32        <li><img style="-webkit-mix-blend-mode: screen" src="resources/ducky.png"></li>
     33        <li><img style="-webkit-mix-blend-mode: overlay" src="resources/ducky.png"></li>
     34        <li><img style="-webkit-mix-blend-mode: darken" src="resources/ducky.png"></li>
     35        <li><img style="-webkit-mix-blend-mode: lighten" src="resources/ducky.png"></li>
     36        <li><img style="-webkit-mix-blend-mode: color-dodge" src="resources/ducky.png"></li>
     37        <li><img style="-webkit-mix-blend-mode: color-burn" src="resources/ducky.png"></li>
     38        <li><img style="-webkit-mix-blend-mode: hard-light" src="resources/ducky.png"></li>
     39        <li><img style="-webkit-mix-blend-mode: soft-light" src="resources/ducky.png"></li>
     40        <li><img style="-webkit-mix-blend-mode: difference" src="resources/ducky.png"></li>
     41        <li><img style="-webkit-mix-blend-mode: exclusion" src="resources/ducky.png"></li>
    4242        <!-- Non separable blend modes -->
    43         <li><img style="-webkit-blend-mode: hue" src="resources/ducky.png"></li>
    44         <li><img style="-webkit-blend-mode: saturation" src="resources/ducky.png"></li>
    45         <li><img style="-webkit-blend-mode: color" src="resources/ducky.png"></li>
    46         <li><img style="-webkit-blend-mode: luminosity" src="resources/ducky.png"></li>
     43        <li><img style="-webkit-mix-blend-mode: hue" src="resources/ducky.png"></li>
     44        <li><img style="-webkit-mix-blend-mode: saturation" src="resources/ducky.png"></li>
     45        <li><img style="-webkit-mix-blend-mode: color" src="resources/ducky.png"></li>
     46        <li><img style="-webkit-mix-blend-mode: luminosity" src="resources/ducky.png"></li>
    4747    </ul>
    4848</body>

  • trunk/LayoutTests/css3/compositing/blend-mode-simple.html

    r161628 r164480  
    2727    <ul>
    2828        <!-- Separable blend modes -->
    29         <li><img style="-webkit-blend-mode: normal" src="resources/ducky.png"></li>
    30         <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
    31         <li><img style="-webkit-blend-mode: screen" src="resources/ducky.png"></li>
    32         <li><img style="-webkit-blend-mode: overlay" src="resources/ducky.png"></li>
    33         <li><img style="-webkit-blend-mode: darken" src="resources/ducky.png"></li>
    34         <li><img style="-webkit-blend-mode: lighten" src="resources/ducky.png"></li>
    35         <li><img style="-webkit-blend-mode: color-dodge" src="resources/ducky.png"></li>
    36         <li><img style="-webkit-blend-mode: color-burn" src="resources/ducky.png"></li>
    37         <li><img style="-webkit-blend-mode: hard-light" src="resources/ducky.png"></li>
    38         <li><img style="-webkit-blend-mode: soft-light" src="resources/ducky.png"></li>
    39         <li><img style="-webkit-blend-mode: difference" src="resources/ducky.png"></li>
    40         <li><img style="-webkit-blend-mode: exclusion" src="resources/ducky.png"></li>
     29        <li><img style="-webkit-mix-blend-mode: normal" src="resources/ducky.png"></li>
     30        <li><img style="-webkit-mix-blend-mode: overlay" src="resources/ducky.png"></li>
     31        <li><img style="-webkit-mix-blend-mode: screen" src="resources/ducky.png"></li>
     32        <li><img style="-webkit-mix-blend-mode: overlay" src="resources/ducky.png"></li>
     33        <li><img style="-webkit-mix-blend-mode: darken" src="resources/ducky.png"></li>
     34        <li><img style="-webkit-mix-blend-mode: lighten" src="resources/ducky.png"></li>
     35        <li><img style="-webkit-mix-blend-mode: color-dodge" src="resources/ducky.png"></li>
     36        <li><img style="-webkit-mix-blend-mode: color-burn" src="resources/ducky.png"></li>
     37        <li><img style="-webkit-mix-blend-mode: hard-light" src="resources/ducky.png"></li>
     38        <li><img style="-webkit-mix-blend-mode: soft-light" src="resources/ducky.png"></li>
     39        <li><img style="-webkit-mix-blend-mode: difference" src="resources/ducky.png"></li>
     40        <li><img style="-webkit-mix-blend-mode: exclusion" src="resources/ducky.png"></li>
    4141        <!-- Non separable blend modes -->
    42         <li><img style="-webkit-blend-mode: hue" src="resources/ducky.png"></li>
    43         <li><img style="-webkit-blend-mode: saturation" src="resources/ducky.png"></li>
    44         <li><img style="-webkit-blend-mode: color" src="resources/ducky.png"></li>
    45         <li><img style="-webkit-blend-mode: luminosity" src="resources/ducky.png"></li>
     42        <li><img style="-webkit-mix-blend-mode: hue" src="resources/ducky.png"></li>
     43        <li><img style="-webkit-mix-blend-mode: saturation" src="resources/ducky.png"></li>
     44        <li><img style="-webkit-mix-blend-mode: color" src="resources/ducky.png"></li>
     45        <li><img style="-webkit-mix-blend-mode: luminosity" src="resources/ducky.png"></li>
    4646    </ul>
    4747</body>

  • trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer.html

    r163955 r164480  
    88    }
    99    .blender {
    10         -webkit-blend-mode: difference;
     10        -webkit-mix-blend-mode: difference;
    1111    }
    1212    .child {

  • trunk/LayoutTests/css3/compositing/script-tests/blend-mode-property-parsing-invalid.js

    r126105 r164480  
    1 description("Test the parsing of the -webkit-blend-mode property.");
     1description("Test the parsing of the -webkit-mix-blend-mode property.");
    22
    33// These have to be global for the test helpers to see them.
    … …  
    66document.head.appendChild(styleElement);
    77stylesheet = styleElement.sheet;
    8 stylesheet.insertRule("body { -webkit-blend-mode: multiply; }", 0);
     8stylesheet.insertRule("body { -webkit-mix-blend-mode: multiply; }", 0);
    99
    1010function testInvalidFilterRule(description, rule)
    … …  
    1313    debug(description + " : " + rule);
    1414
    15     stylesheet.insertRule("body { -webkit-blend-mode: " + rule + "; }", 0);
     15    stylesheet.insertRule("body { -webkit-mix-blend-mode: " + rule + "; }", 0);
    1616    cssRule = stylesheet.cssRules.item(0);
    1717 
    … …  
    2020    declaration = cssRule.style;
    2121    shouldBe("declaration.length", "0");
    22     shouldBe("declaration.getPropertyValue('-webkit-blend-mode')", "null");
     22    shouldBe("declaration.getPropertyValue('-webkit-mix-blend-mode')", "null");
    2323}
    2424

  • trunk/LayoutTests/css3/compositing/script-tests/blend-mode-property-parsing.js

    r126105 r164480  
    1 description("Test the parsing of the -webkit-blend-mode property.");
     1description("Test the parsing of the -webkit-mix-blend-mode property.");
    22
    33function jsWrapperClass(node)
    … …  
    3131    debug(description + " : " + rule);
    3232
    33     stylesheet.insertRule("body { -webkit-blend-mode: " + rule + "; }", 0);
     33    stylesheet.insertRule("body { -webkit-mix-blend-mode: " + rule + "; }", 0);
    3434    cssRule = stylesheet.cssRules.item(0);
    3535 
    … …  
    3838    declaration = cssRule.style;
    3939    shouldBe("declaration.length", "1");
    40     shouldBe("declaration.getPropertyValue('-webkit-blend-mode')", "'" + expectedValue + "'");
     40    shouldBe("declaration.getPropertyValue('-webkit-mix-blend-mode')", "'" + expectedValue + "'");
    4141
    42     blendModeRule = declaration.getPropertyCSSValue('-webkit-blend-mode');
     42    blendModeRule = declaration.getPropertyCSSValue('-webkit-mix-blend-mode');
    4343    shouldBeType("blendModeRule", "CSSPrimitiveValue");
    4444}

  • trunk/LayoutTests/css3/compositing/script-tests/blend-mode-property.js

    r130460 r164480  
    1 description("Test the parsing of the -webkit-blend-mode property.");
     1description("Test the parsing of the -webkit-mix-blend-mode property.");
    22
    33var styleElement = document.createElement("style");
    … …  
    1010{
    1111// add a -webkit-filter property to the start of the stylesheet
    12 stylesheet.addRule("body", "-webkit-blend-mode: " + blendmode, 0);
     12stylesheet.addRule("body", "-webkit-mix-blend-mode: " + blendmode, 0);
    1313
    1414cssRule = stylesheet.cssRules.item(0);
    … …  
    1818declaration = cssRule.style;
    1919shouldBe("declaration.length", "1");
    20 shouldBe("declaration.getPropertyValue('-webkit-blend-mode')", "\'" + blendmode + "\'");
     20shouldBe("declaration.getPropertyValue('-webkit-mix-blend-mode')", "\'" + blendmode + "\'");
    2121}
    2222

  • trunk/LayoutTests/css3/compositing/svg-blend-color-burn.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: color-burn"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: color-burn"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-color-dodge.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: color-dodge"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: color-dodge"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-color.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: color"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: color"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-darken.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: darken"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: darken"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-difference.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: difference"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: difference"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-exclusion.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: exclusion"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: exclusion"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-hard-light.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: hard-light"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: hard-light"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-hue.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: hue"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: hue"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-blend.html

    r164294 r164480  
    66<g transform="scale(4 4)">
    77  <rect x="0" y="0" width="40" height="40" fill="rgb(0,255,0)"/>
    8   <g style="-webkit-blend-mode: multiply">
    9     <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-blend-mode: difference"/>
     8  <g style="-webkit-mix-blend-mode: multiply">
     9    <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-mix-blend-mode: difference"/>
    1010  </g>
    1111</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-clip-path.html

    r164294 r164480  
    1212  <rect x="0" y="0" width="40" height="40" fill="rgb(255,255,0)"/>
    1313  <g clip-path="url(#clip)">
    14     <rect x="0" y="0" width="40" height="40" fill="rgb(255,0,0)" style="-webkit-blend-mode: difference"/>
     14    <rect x="0" y="0" width="40" height="40" fill="rgb(255,0,0)" style="-webkit-mix-blend-mode: difference"/>
    1515  </g>
    1616</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-filter.html

    r164294 r164480  
    1212  <rect x="0" y="0" width="40" height="40" fill="rgb(0,255,0)"/>
    1313  <g filter="url(#f1)">
    14     <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-blend-mode: difference"/>
     14    <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-mix-blend-mode: difference"/>
    1515  </g>
    1616</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-mask.html

    r164294 r164480  
    1212  <rect x="0" y="0" width="40" height="40" fill="rgb(0,255,0)"/>
    1313  <g mask="url(#msk)">
    14     <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-blend-mode: difference"/>
     14    <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-mix-blend-mode: difference"/>
    1515  </g>
    1616</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-opacity.html

    r164294 r164480  
    77  <rect x="0" y="0" width="40" height="40" fill="rgb(0,255,0)"/>
    88  <g opacity=".5">
    9     <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-blend-mode: difference"/>
     9    <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-mix-blend-mode: difference"/>
    1010  </g>
    1111</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-layer-shadow.html

    r164294 r164480  
    88  <rect x="0" y="0" width="40" height="40" fill="rgb(0,255,0)"/>
    99  <g style="-webkit-svg-shadow:0px 0px 1px rgba(0,0,0,0);">
    10     <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-blend-mode: difference"/>
     10    <rect x="10" y="10" width="20" height="20" fill="rgb(0,255,0)" style="-webkit-mix-blend-mode: difference"/>
    1111  </g>
    1212</g>

  • trunk/LayoutTests/css3/compositing/svg-blend-lighten.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: lighten"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: lighten"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-luminosity.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: luminosity"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: luminosity"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-multiply-alpha.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="opacity: .5; -webkit-blend-mode: multiply"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="opacity: .5; -webkit-mix-blend-mode: multiply"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-multiply.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: multiply"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: multiply"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-normal.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: normal"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: normal"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-overlay.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: overlay"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: overlay"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-saturation.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: saturation"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: saturation"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-screen.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: screen"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: screen"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/css3/compositing/svg-blend-soft-light.html

    r164294 r164480  
    1414<g transform="scale(4 4)">
    1515  <use xlink:href="#patch" x="0" y="0" width="40" height="10"></use>
    16   <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-blend-mode: soft-light"></use>
     16  <use xlink:href="#patch" x="0" y="0" width="40" height="10" transform="rotate(90 20 20)" style="-webkit-mix-blend-mode: soft-light"></use>
    1717</g>
    1818</svg>

  • trunk/LayoutTests/transitions/blendmode-transitions-expected.txt

    r131146 r164480  
    11Test to make sure that the blendmode property is properly propagated to shared styles
    22BOX
    3 PASS - "-webkit-blend-mode" property for "box" element at 0.5s saw something close to: difference
     3PASS - "-webkit-mix-blend-mode" property for "box" element at 0.5s saw something close to: difference
    44

  • trunk/LayoutTests/transitions/blendmode-transitions.html

    r131146 r164480  
    1515      -webkit-transition-property: opacity;
    1616          opacity:1;
    17           -webkit-blend-mode: difference;
     17          -webkit-mix-blend-mode: difference;
    1818    }
    1919   
    … …  
    2727    const expectedValues = [
    2828      // [time, element-id, property, expected-value, tolerance]
    29       [0.5, 'box', '-webkit-blend-mode', 'difference', 0],
     29      [0.5, 'box', '-webkit-mix-blend-mode', 'difference', 0],
    3030    ];
    3131 

  • trunk/Source/WebCore/ChangeLog

    r164479 r164480  
     12014-02-21  Mihai Tica  <mitica@adobe.com>
     2
     3        [CSS Blending] Refactor -webkit-blend-mode to -webkit-mix-blend-mode
     4        https://bugs.webkit.org/show_bug.cgi?id=128805
     5
     6        Reviewed by Dean Jackson.
     7
     8        The spec defines the mix-blend-mode property. This means that the
     9        prefixed version should be -webkit-mix-blend-mode, instead of
     10        -webkit-blend-mode.
     11
     12        * css/CSSComputedStyleDeclaration.cpp:
     13        (WebCore::ComputedStyleExtractor::propertyValue):
     14        * css/CSSParser.cpp:
     15        (WebCore::isValidKeywordPropertyAndValue):
     16        (WebCore::isKeywordPropertyID):
     17        (WebCore::CSSParser::parseValue):
     18        * css/CSSPropertyNames.in:
     19        * css/DeprecatedStyleBuilder.cpp:
     20        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     21
    1222014-02-21  Ryosuke Niwa  <rniwa@webkit.org>
    223

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r164224 r164480  
    228228    CSSPropertyWebkitBackgroundSize,
    229229#if ENABLE(CSS_COMPOSITING)
    230     CSSPropertyWebkitBlendMode,
     230    CSSPropertyWebkitMixBlendMode,
    231231#endif
    232232    CSSPropertyWebkitBorderFit,
    … …  
    28412841#endif
    28422842#if ENABLE(CSS_COMPOSITING)
    2843         case CSSPropertyWebkitBlendMode:
     2843        case CSSPropertyWebkitMixBlendMode:
    28442844            return cssValuePool().createValue(style->blendMode());
    28452845#endif

  • trunk/Source/WebCore/css/CSSParser.cpp

    r164115 r164480  
    803803        break;
    804804#if ENABLE(CSS_COMPOSITING)
    805     case CSSPropertyWebkitBlendMode:
     805    case CSSPropertyWebkitMixBlendMode:
    806806        if (parserContext.isCSSCompositingEnabled && (valueID == CSSValueNormal || valueID == CSSValueMultiply || valueID == CSSValueScreen
    807807            || valueID == CSSValueOverlay || valueID == CSSValueDarken || valueID == CSSValueLighten ||  valueID == CSSValueColorDodge
    … …  
    10791079    case CSSPropertyWebkitAppearance:
    10801080#if ENABLE(CSS_COMPOSITING)
    1081     case CSSPropertyWebkitBlendMode:
     1081    case CSSPropertyWebkitMixBlendMode:
    10821082#endif
    10831083    case CSSPropertyWebkitBackfaceVisibility:
    … …  
    24122412#endif
    24132413#if ENABLE(CSS_COMPOSITING)
    2414     case CSSPropertyWebkitBlendMode:
     2414    case CSSPropertyWebkitMixBlendMode:
    24152415        if (cssCompositingEnabled())
    24162416            validPrimitive = true;

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r164035 r164480  
    283283#endif
    284284#if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
    285 -webkit-blend-mode
     285-webkit-mix-blend-mode
    286286#endif
    287287#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS

  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r164115 r164480  
    24882488    setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
    24892489#if ENABLE(CSS_COMPOSITING)
    2490     setPropertyHandler(CSSPropertyWebkitBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());
     2490    setPropertyHandler(CSSPropertyWebkitMixBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());
    24912491#endif
    24922492    setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());
Note: See TracChangeset for help on using the changeset viewer.