Changeset 205809 in webkit


Ignore:
Timestamp:
Sep 12, 2016 8:50:17 AM (8 years ago)
Author:
Simon Fraser
Message:

Make -webkit-transition-* and -webkit-animation-* properties be pure aliases of the unprefixed ones
​https://bugs.webkit.org/show_bug.cgi?id=160478

Reviewed by Dean Jackson.

Source/WebCore:

Remove the custom -webkit prefixed transition and animation properties, and just make
them aliases of the unprefixed ones, as we do for transforms.

-webkit-animation-trigger remains as the only prefixed-only animation property.

This is mostly code deletion.

Test: fast/css/longhand-overrides-shorthand-prefixing.html

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSProperty.h:

(WebCore::prefixingVariantForPropertyId): Deleted.

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

(WebCore::CSSToStyleMap::mapAnimationDelay):
(WebCore::CSSToStyleMap::mapAnimationDirection):
(WebCore::CSSToStyleMap::mapAnimationDuration):
(WebCore::CSSToStyleMap::mapAnimationFillMode):
(WebCore::CSSToStyleMap::mapAnimationIterationCount):
(WebCore::CSSToStyleMap::mapAnimationName):
(WebCore::CSSToStyleMap::mapAnimationPlayState):
(WebCore::CSSToStyleMap::mapAnimationProperty):
(WebCore::CSSToStyleMap::mapAnimationTimingFunction):

  • css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValueInternal):
(WebCore::PropertySetCSSStyleDeclaration::getPropertyValueInternal):

  • css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue):
(WebCore::MutableStyleProperties::removeShorthandProperty):
(WebCore::StyleProperties::asText):

  • css/StylePropertyShorthand.cpp:

(WebCore::animationShorthandForParsing):

  • css/StylePropertyShorthand.h:
  • css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForKeyframe):

  • css/parser/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseAnimationShorthand):
(WebCore::CSSParser::parseTransitionShorthand):
(WebCore::CSSParser::parseAnimationProperty):
(WebCore::CSSParser::addPropertyWithPrefixingVariant): Deleted.

  • css/parser/CSSParser.h:
  • html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlPanelElement::makeOpaque):
(WebCore::MediaControlPanelElement::makeTransparent):

LayoutTests:

Updated results, and a new test to ensure that longhand properties override
shorthand ones, with various combinations of prefixing.

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/longhand-overrides-shorthand-prefixing-expected.txt: Added.
  • fast/css/longhand-overrides-shorthand-prefixing.html: Added.
  • fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt:
  • fast/css/prefixed-unprefixed-variant-style-declaration.html:
  • transitions/svg-transitions-expected.txt:
  • transitions/transitions-parsing-expected.txt:
  • transitions/transitions-parsing.html:
Location:
trunk
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r205807 r205809  
     12016-09-12  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make -webkit-transition-* and -webkit-animation-* properties be pure aliases of the unprefixed ones
     4        https://bugs.webkit.org/show_bug.cgi?id=160478
     5
     6        Reviewed by Dean Jackson.
     7       
     8        Updated results, and a new test to ensure that longhand properties override
     9        shorthand ones, with various combinations of prefixing.
     10
     11        * fast/css/getComputedStyle/computed-style-expected.txt:
     12        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     13        * fast/css/longhand-overrides-shorthand-prefixing-expected.txt: Added.
     14        * fast/css/longhand-overrides-shorthand-prefixing.html: Added.
     15        * fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt:
     16        * fast/css/prefixed-unprefixed-variant-style-declaration.html:
     17        * transitions/svg-transitions-expected.txt:
     18        * transitions/transitions-parsing-expected.txt:
     19        * transitions/transitions-parsing.html:
     20
    1212016-09-12  Javier Fernandez  <jfernandez@igalia.com>
    222

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r201498 r205809  
    108108z-index: auto;
    109109zoom: 1;
    110 -webkit-animation-delay: 0s;
    111 -webkit-animation-direction: normal;
    112 -webkit-animation-duration: 0s;
    113 -webkit-animation-fill-mode: none;
    114 -webkit-animation-iteration-count: 1;
    115 -webkit-animation-name: none;
    116 -webkit-animation-play-state: running;
    117 -webkit-animation-timing-function: ease;
    118110-webkit-appearance: none;
    119111-webkit-backface-visibility: visible;
    … …  
    223215-webkit-text-stroke-width: 0px;
    224216-webkit-transform-style: flat;
    225 -webkit-transition-delay: 0s;
    226 -webkit-transition-duration: 0s;
    227 -webkit-transition-property: all;
    228 -webkit-transition-timing-function: ease;
    229217-webkit-user-drag: auto;
    230218-webkit-user-modify: read-only;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r201498 r205809  
    107107z-index: auto
    108108zoom: 1
    109 -webkit-animation-delay: 0s
    110 -webkit-animation-direction: normal
    111 -webkit-animation-duration: 0s
    112 -webkit-animation-fill-mode: none
    113 -webkit-animation-iteration-count: 1
    114 -webkit-animation-name: none
    115 -webkit-animation-play-state: running
    116 -webkit-animation-timing-function: ease
    117109-webkit-appearance: none
    118110-webkit-backface-visibility: visible
    … …  
    222214-webkit-text-stroke-width: 0px
    223215-webkit-transform-style: flat
    224 -webkit-transition-delay: 0s
    225 -webkit-transition-duration: 0s
    226 -webkit-transition-property: all
    227 -webkit-transition-timing-function: ease
    228216-webkit-user-drag: auto
    229217-webkit-user-modify: read-only

  • trunk/LayoutTests/fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt

    r204052 r205809  
    364364PASS element.style.cssText
    365365
     366Setting "transform" to "matrix(1, 0, 0, 1, 1, 1)"
     367PASS element.style.transform
     368PASS element.style.webkitTransform
     369PASS element.style.getPropertyValue("transform")
     370PASS element.style.getPropertyValue("-webkit-transform")
     371PASS element.style.getPropertyCSSValue("transform")
     372PASS element.style.getPropertyCSSValue("-webkit-transform")
     373PASS getComputedStyle(element).transform
     374PASS getComputedStyle(element).webkitTransform
     375PASS getComputedStyle(element).getPropertyValue("transform")
     376PASS getComputedStyle(element).getPropertyValue("-webkit-transform")
     377PASS getComputedStyle(element).getPropertyCSSValue("transform")
     378PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transform")
     379PASS element.style.cssText
     380
     381Setting "-webkit-transform" to "matrix(1, 0, 0, 1, 1, 1)"
     382PASS element.style.transform
     383PASS element.style.webkitTransform
     384PASS element.style.getPropertyValue("transform")
     385PASS element.style.getPropertyValue("-webkit-transform")
     386PASS element.style.getPropertyCSSValue("transform")
     387PASS element.style.getPropertyCSSValue("-webkit-transform")
     388PASS getComputedStyle(element).transform
     389PASS getComputedStyle(element).webkitTransform
     390PASS getComputedStyle(element).getPropertyValue("transform")
     391PASS getComputedStyle(element).getPropertyValue("-webkit-transform")
     392PASS getComputedStyle(element).getPropertyCSSValue("transform")
     393PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transform")
     394PASS element.style.cssText
     395
    366396PASS successfullyParsed is true
    367397

  • trunk/LayoutTests/fast/css/prefixed-unprefixed-variant-style-declaration.html

    r200769 r205809  
    5757    test(`getComputedStyle(element).getPropertyCSSValue("${prefixedProperty}")`, computedStyle.getPropertyCSSValue(prefixedProperty).cssText);
    5858
    59     test(`element.style.cssText`, element.style.cssText, `${propertyToSet}: ${value};`);
     59    test(`element.style.cssText`, element.style.cssText, `${unprefixedProperty}: ${value};`);
    6060
    6161    element.remove();
    … …  
    7878testPropertyVariants("animation-fill-mode", "forwards");
    7979
     80testPropertyVariants("transform", "matrix(1, 0, 0, 1, 1, 1)");
     81
    8082successfullyParsed = true;
    8183

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r203716 r205809  
    213213rect: style.getPropertyValue(zoom) : 1
    214214rect: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
    215 rect: style.getPropertyValue(-webkit-animation-delay) : 0s
    216 rect: style.getPropertyCSSValue(-webkit-animation-delay) : [object CSSValueList]
    217 rect: style.getPropertyValue(-webkit-animation-direction) : normal
    218 rect: style.getPropertyCSSValue(-webkit-animation-direction) : [object CSSValueList]
    219 rect: style.getPropertyValue(-webkit-animation-duration) : 0s
    220 rect: style.getPropertyCSSValue(-webkit-animation-duration) : [object CSSValueList]
    221 rect: style.getPropertyValue(-webkit-animation-fill-mode) : none
    222 rect: style.getPropertyCSSValue(-webkit-animation-fill-mode) : [object CSSValueList]
    223 rect: style.getPropertyValue(-webkit-animation-iteration-count) : 1
    224 rect: style.getPropertyCSSValue(-webkit-animation-iteration-count) : [object CSSValueList]
    225 rect: style.getPropertyValue(-webkit-animation-name) : none
    226 rect: style.getPropertyCSSValue(-webkit-animation-name) : [object CSSValueList]
    227 rect: style.getPropertyValue(-webkit-animation-play-state) : running
    228 rect: style.getPropertyCSSValue(-webkit-animation-play-state) : [object CSSValueList]
    229 rect: style.getPropertyValue(-webkit-animation-timing-function) : ease
    230 rect: style.getPropertyCSSValue(-webkit-animation-timing-function) : [object CSSValueList]
    231215rect: style.getPropertyValue(-webkit-appearance) : none
    232216rect: style.getPropertyCSSValue(-webkit-appearance) : [object CSSPrimitiveValue]
    … …  
    443427rect: style.getPropertyValue(-webkit-transform-style) : flat
    444428rect: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]
    445 rect: style.getPropertyValue(-webkit-transition-delay) : 0s
    446 rect: style.getPropertyCSSValue(-webkit-transition-delay) : [object CSSValueList]
    447 rect: style.getPropertyValue(-webkit-transition-duration) : 0s
    448 rect: style.getPropertyCSSValue(-webkit-transition-duration) : [object CSSValueList]
    449 rect: style.getPropertyValue(-webkit-transition-property) : all
    450 rect: style.getPropertyCSSValue(-webkit-transition-property) : [object CSSValueList]
    451 rect: style.getPropertyValue(-webkit-transition-timing-function) : ease
    452 rect: style.getPropertyCSSValue(-webkit-transition-timing-function) : [object CSSValueList]
    453429rect: style.getPropertyValue(-webkit-user-drag) : auto
    454430rect: style.getPropertyCSSValue(-webkit-user-drag) : [object CSSPrimitiveValue]
    … …  
    747723g: style.getPropertyValue(zoom) : 1
    748724g: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
    749 g: style.getPropertyValue(-webkit-animation-delay) : 0s
    750 g: style.getPropertyCSSValue(-webkit-animation-delay) : [object CSSValueList]
    751 g: style.getPropertyValue(-webkit-animation-direction) : normal
    752 g: style.getPropertyCSSValue(-webkit-animation-direction) : [object CSSValueList]
    753 g: style.getPropertyValue(-webkit-animation-duration) : 0s
    754 g: style.getPropertyCSSValue(-webkit-animation-duration) : [object CSSValueList]
    755 g: style.getPropertyValue(-webkit-animation-fill-mode) : none
    756 g: style.getPropertyCSSValue(-webkit-animation-fill-mode) : [object CSSValueList]
    757 g: style.getPropertyValue(-webkit-animation-iteration-count) : 1
    758 g: style.getPropertyCSSValue(-webkit-animation-iteration-count) : [object CSSValueList]
    759 g: style.getPropertyValue(-webkit-animation-name) : none
    760 g: style.getPropertyCSSValue(-webkit-animation-name) : [object CSSValueList]
    761 g: style.getPropertyValue(-webkit-animation-play-state) : running
    762 g: style.getPropertyCSSValue(-webkit-animation-play-state) : [object CSSValueList]
    763 g: style.getPropertyValue(-webkit-animation-timing-function) : ease
    764 g: style.getPropertyCSSValue(-webkit-animation-timing-function) : [object CSSValueList]
    765725g: style.getPropertyValue(-webkit-appearance) : none
    766726g: style.getPropertyCSSValue(-webkit-appearance) : [object CSSPrimitiveValue]
    … …  
    977937g: style.getPropertyValue(-webkit-transform-style) : flat
    978938g: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]
    979 g: style.getPropertyValue(-webkit-transition-delay) : 0s
    980 g: style.getPropertyCSSValue(-webkit-transition-delay) : [object CSSValueList]
    981 g: style.getPropertyValue(-webkit-transition-duration) : 0s
    982 g: style.getPropertyCSSValue(-webkit-transition-duration) : [object CSSValueList]
    983 g: style.getPropertyValue(-webkit-transition-property) : all
    984 g: style.getPropertyCSSValue(-webkit-transition-property) : [object CSSValueList]
    985 g: style.getPropertyValue(-webkit-transition-timing-function) : ease
    986 g: style.getPropertyCSSValue(-webkit-transition-timing-function) : [object CSSValueList]
    987939g: style.getPropertyValue(-webkit-user-drag) : auto
    988940g: style.getPropertyCSSValue(-webkit-user-drag) : [object CSSPrimitiveValue]

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

    r144644 r205809  
    88PASS computedStyle.webkitTransitionProperty is 'all'
    99PASS Object.keys(style).indexOf('transitionProperty') is not -1
    10 PASS Object.keys(style).indexOf('webkitTransitionProperty') is not -1
     10PASS Object.keys(style).indexOf('webkitTransitionProperty') is -1
    1111PASS style.transitionProperty is 'none'
    1212PASS computedStyle.transitionProperty is 'none'
    … …  
    102102PASS computedStyle.webkitTransitionDuration is '0s'
    103103PASS Object.keys(style).indexOf('transitionDuration') is not -1
    104 PASS Object.keys(style).indexOf('webkitTransitionDuration') is not -1
     104PASS Object.keys(style).indexOf('webkitTransitionDuration') is -1
    105105PASS style.transitionDuration is '0s'
    106106PASS computedStyle.transitionDuration is '0s'
    … …  
    152152PASS computedStyle.webkitTransitionTimingFunction is 'ease'
    153153PASS Object.keys(style).indexOf('transitionTimingFunction') is not -1
    154 PASS Object.keys(style).indexOf('webkitTransitionTimingFunction') is not -1
     154PASS Object.keys(style).indexOf('webkitTransitionTimingFunction') is -1
    155155PASS style.transitionTimingFunction is 'linear'
    156156PASS computedStyle.transitionTimingFunction is 'linear'
    … …  
    298298PASS computedStyle.webkitTransitionDelay is '0s'
    299299PASS Object.keys(style).indexOf('transitionDelay') is not -1
    300 PASS Object.keys(style).indexOf('webkitTransitionDelay') is not -1
     300PASS Object.keys(style).indexOf('webkitTransitionDelay') is -1
    301301PASS style.transitionDelay is '0s'
    302302PASS computedStyle.transitionDelay is '0s'
    … …  
    348348PASS computedStyle.webkitTransition is 'all 0s ease 0s'
    349349PASS Object.keys(style).indexOf('transition') is not -1
    350 PASS Object.keys(style).indexOf('webkitTransition') is not -1
     350PASS Object.keys(style).indexOf('webkitTransition') is -1
    351351PASS style.transition is 'none'
    352352PASS computedStyle.transition is 'none 0s ease 0s'

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

    r155285 r205809  
    3232style.transitionProperty = "none";
    3333shouldNotBe("Object.keys(style).indexOf('transitionProperty')", "-1");
    34 shouldNotBe("Object.keys(style).indexOf('webkitTransitionProperty')", "-1");
     34shouldBe("Object.keys(style).indexOf('webkitTransitionProperty')", "-1");
    3535shouldBe("style.transitionProperty", "'none'");
    3636shouldBe("computedStyle.transitionProperty", "'none'");
    … …  
    176176style.transitionDuration = "0s";
    177177shouldNotBe("Object.keys(style).indexOf('transitionDuration')", "-1");
    178 shouldNotBe("Object.keys(style).indexOf('webkitTransitionDuration')", "-1");
     178shouldBe("Object.keys(style).indexOf('webkitTransitionDuration')", "-1");
    179179shouldBe("style.transitionDuration", "'0s'");
    180180shouldBe("computedStyle.transitionDuration", "'0s'");
    … …  
    256256style.transitionTimingFunction = "linear";
    257257shouldNotBe("Object.keys(style).indexOf('transitionTimingFunction')", "-1");
    258 shouldNotBe("Object.keys(style).indexOf('webkitTransitionTimingFunction')", "-1");
     258shouldBe("Object.keys(style).indexOf('webkitTransitionTimingFunction')", "-1");
    259259shouldBe("style.transitionTimingFunction", "'linear'");
    260260shouldBe("computedStyle.transitionTimingFunction", "'linear'");
    … …  
    479479style.transitionDelay = "0s";
    480480shouldNotBe("Object.keys(style).indexOf('transitionDelay')", "-1");
    481 shouldNotBe("Object.keys(style).indexOf('webkitTransitionDelay')", "-1");
     481shouldBe("Object.keys(style).indexOf('webkitTransitionDelay')", "-1");
    482482shouldBe("style.transitionDelay", "'0s'");
    483483shouldBe("computedStyle.transitionDelay", "'0s'");
    … …  
    559559style.transition = "none";
    560560shouldNotBe("Object.keys(style).indexOf('transition')", "-1");
    561 shouldNotBe("Object.keys(style).indexOf('webkitTransition')", "-1");
     561shouldBe("Object.keys(style).indexOf('webkitTransition')", "-1");
    562562shouldBe("style.transition", "'none'");
    563563shouldBe("computedStyle.transition", "'none 0s ease 0s'");

  • trunk/Source/WebCore/ChangeLog

    r205808 r205809  
     12016-09-12  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make -webkit-transition-* and -webkit-animation-* properties be pure aliases of the unprefixed ones
     4        https://bugs.webkit.org/show_bug.cgi?id=160478
     5
     6        Reviewed by Dean Jackson.
     7       
     8        Remove the custom -webkit prefixed transition and animation properties, and just make
     9        them aliases of the unprefixed ones, as we do for transforms.
     10       
     11        -webkit-animation-trigger remains as the only prefixed-only animation property.
     12       
     13        This is mostly code deletion.
     14
     15        Test: fast/css/longhand-overrides-shorthand-prefixing.html
     16
     17        * css/CSSComputedStyleDeclaration.cpp:
     18        (WebCore::ComputedStyleExtractor::propertyValue):
     19        * css/CSSProperty.h:
     20        (WebCore::prefixingVariantForPropertyId): Deleted.
     21        * css/CSSPropertyNames.in:
     22        * css/CSSToStyleMap.cpp:
     23        (WebCore::CSSToStyleMap::mapAnimationDelay):
     24        (WebCore::CSSToStyleMap::mapAnimationDirection):
     25        (WebCore::CSSToStyleMap::mapAnimationDuration):
     26        (WebCore::CSSToStyleMap::mapAnimationFillMode):
     27        (WebCore::CSSToStyleMap::mapAnimationIterationCount):
     28        (WebCore::CSSToStyleMap::mapAnimationName):
     29        (WebCore::CSSToStyleMap::mapAnimationPlayState):
     30        (WebCore::CSSToStyleMap::mapAnimationProperty):
     31        (WebCore::CSSToStyleMap::mapAnimationTimingFunction):
     32        * css/PropertySetCSSStyleDeclaration.cpp:
     33        (WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValueInternal):
     34        (WebCore::PropertySetCSSStyleDeclaration::getPropertyValueInternal):
     35        * css/StyleProperties.cpp:
     36        (WebCore::StyleProperties::getPropertyValue):
     37        (WebCore::MutableStyleProperties::removeShorthandProperty):
     38        (WebCore::StyleProperties::asText):
     39        * css/StylePropertyShorthand.cpp:
     40        (WebCore::animationShorthandForParsing):
     41        * css/StylePropertyShorthand.h:
     42        * css/StyleResolver.cpp:
     43        (WebCore::StyleResolver::styleForKeyframe):
     44        * css/parser/CSSParser.cpp:
     45        (WebCore::CSSParser::parseValue):
     46        (WebCore::CSSParser::parseAnimationShorthand):
     47        (WebCore::CSSParser::parseTransitionShorthand):
     48        (WebCore::CSSParser::parseAnimationProperty):
     49        (WebCore::CSSParser::addPropertyWithPrefixingVariant): Deleted.
     50        * css/parser/CSSParser.h:
     51        * html/shadow/MediaControlElements.cpp:
     52        (WebCore::MediaControlPanelElement::makeOpaque):
     53        (WebCore::MediaControlPanelElement::makeTransparent):
     54
    1552016-09-12  Per Arne Vollan  <pvollan@apple.com>
    256

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

    r205323 r205809  
    245245    CSSPropertyZIndex,
    246246    CSSPropertyZoom,
    247     CSSPropertyWebkitAnimationDelay,
    248     CSSPropertyWebkitAnimationDirection,
    249     CSSPropertyWebkitAnimationDuration,
    250     CSSPropertyWebkitAnimationFillMode,
    251     CSSPropertyWebkitAnimationIterationCount,
    252     CSSPropertyWebkitAnimationName,
    253     CSSPropertyWebkitAnimationPlayState,
    254     CSSPropertyWebkitAnimationTimingFunction,
    255247#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
    256248    CSSPropertyWebkitAnimationTrigger,
    … …  
    408400    CSSPropertyWebkitTextZoom,
    409401    CSSPropertyWebkitTransformStyle,
    410     CSSPropertyWebkitTransitionDelay,
    411     CSSPropertyWebkitTransitionDuration,
    412     CSSPropertyWebkitTransitionProperty,
    413     CSSPropertyWebkitTransitionTimingFunction,
    414402    CSSPropertyWebkitUserDrag,
    415403    CSSPropertyWebkitUserModify,
    … …  
    33503338#endif
    33513339        case CSSPropertyAnimationDelay:
    3352         case CSSPropertyWebkitAnimationDelay:
    33533340            return getDelayValue(style->animations());
    3354         case CSSPropertyAnimationDirection:
    3355         case CSSPropertyWebkitAnimationDirection: {
     3341        case CSSPropertyAnimationDirection: {
    33563342            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    33573343            const AnimationList* t = style->animations();
    … …  
    33783364        }
    33793365        case CSSPropertyAnimationDuration:
    3380         case CSSPropertyWebkitAnimationDuration:
    33813366            return getDurationValue(style->animations());
    3382         case CSSPropertyAnimationFillMode:
    3383         case CSSPropertyWebkitAnimationFillMode: {
     3367        case CSSPropertyAnimationFillMode: {
    33843368            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    33853369            const AnimationList* t = style->animations();
    … …  
    34053389            return list;
    34063390        }
    3407         case CSSPropertyAnimationIterationCount:
    3408         case CSSPropertyWebkitAnimationIterationCount: {
     3391        case CSSPropertyAnimationIterationCount: {
    34093392            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    34103393            const AnimationList* t = style->animations();
    … …  
    34213404            return list;
    34223405        }
    3423         case CSSPropertyAnimationName:
    3424         case CSSPropertyWebkitAnimationName: {
     3406        case CSSPropertyAnimationName: {
    34253407            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    34263408            const AnimationList* t = style->animations();
    … …  
    34323414            return list;
    34333415        }
    3434         case CSSPropertyAnimationPlayState:
    3435         case CSSPropertyWebkitAnimationPlayState: {
     3416        case CSSPropertyAnimationPlayState: {
    34363417            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    34373418            const AnimationList* t = style->animations();
    … …  
    34493430        }
    34503431        case CSSPropertyAnimationTimingFunction:
    3451         case CSSPropertyWebkitAnimationTimingFunction:
    34523432            return getTimingFunctionValue(style->animations());
    34533433#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
    … …  
    35933573            return cssValuePool.createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat);
    35943574        case CSSPropertyTransitionDelay:
    3595         case CSSPropertyWebkitTransitionDelay:
    35963575            return getDelayValue(style->transitions());
    35973576        case CSSPropertyTransitionDuration:
    3598         case CSSPropertyWebkitTransitionDuration:
    35993577            return getDurationValue(style->transitions());
    36003578        case CSSPropertyTransitionProperty:
    3601         case CSSPropertyWebkitTransitionProperty:
    36023579            return getTransitionPropertyValue(style->transitions());
    36033580        case CSSPropertyTransitionTimingFunction:
    3604         case CSSPropertyWebkitTransitionTimingFunction:
    36053581            return getTimingFunctionValue(style->transitions());
    3606         case CSSPropertyTransition:
    3607         case CSSPropertyWebkitTransition: {
     3582        case CSSPropertyTransition: {
    36083583            const AnimationList* animList = style->transitions();
    36093584            if (animList) {
    … …  
    38743849
    38753850        /* Unimplemented -webkit- properties */
    3876         case CSSPropertyWebkitAnimation:
    38773851        case CSSPropertyWebkitBorderRadius:
    38783852        case CSSPropertyWebkitMarginCollapse:

  • trunk/Source/WebCore/css/CSSProperty.h

    r201113 r205809  
    104104typedef Vector<CSSProperty, 256> ParsedPropertyVector;
    105105
    106 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propertyID)
    107 {
    108     ASSERT(propertyID != CSSPropertyInvalid);
    109 
    110     switch (propertyID) {
    111     case CSSPropertyAnimation:
    112         return CSSPropertyWebkitAnimation;
    113     case CSSPropertyAnimationDelay:
    114         return CSSPropertyWebkitAnimationDelay;
    115     case CSSPropertyAnimationDirection:
    116         return CSSPropertyWebkitAnimationDirection;
    117     case CSSPropertyAnimationDuration:
    118         return CSSPropertyWebkitAnimationDuration;
    119     case CSSPropertyAnimationFillMode:
    120         return CSSPropertyWebkitAnimationFillMode;
    121     case CSSPropertyAnimationName:
    122         return CSSPropertyWebkitAnimationName;
    123     case CSSPropertyAnimationPlayState:
    124         return CSSPropertyWebkitAnimationPlayState;
    125     case CSSPropertyAnimationIterationCount:
    126         return CSSPropertyWebkitAnimationIterationCount;
    127     case CSSPropertyAnimationTimingFunction:
    128         return CSSPropertyWebkitAnimationTimingFunction;
    129     case CSSPropertyWebkitAnimation:
    130         return CSSPropertyAnimation;
    131     case CSSPropertyWebkitAnimationDelay:
    132         return CSSPropertyAnimationDelay;
    133     case CSSPropertyWebkitAnimationDirection:
    134         return CSSPropertyAnimationDirection;
    135     case CSSPropertyWebkitAnimationDuration:
    136         return CSSPropertyAnimationDuration;
    137     case CSSPropertyWebkitAnimationFillMode:
    138         return CSSPropertyAnimationFillMode;
    139     case CSSPropertyWebkitAnimationName:
    140         return CSSPropertyAnimationName;
    141     case CSSPropertyWebkitAnimationPlayState:
    142         return CSSPropertyAnimationPlayState;
    143     case CSSPropertyWebkitAnimationIterationCount:
    144         return CSSPropertyAnimationIterationCount;
    145     case CSSPropertyWebkitAnimationTimingFunction:
    146         return CSSPropertyAnimationTimingFunction;
    147     case CSSPropertyTransitionDelay:
    148         return CSSPropertyWebkitTransitionDelay;
    149     case CSSPropertyTransitionDuration:
    150         return CSSPropertyWebkitTransitionDuration;
    151     case CSSPropertyTransitionProperty:
    152         return CSSPropertyWebkitTransitionProperty;
    153     case CSSPropertyTransitionTimingFunction:
    154         return CSSPropertyWebkitTransitionTimingFunction;
    155     case CSSPropertyTransition:
    156         return CSSPropertyWebkitTransition;
    157     case CSSPropertyWebkitTransitionDelay:
    158         return CSSPropertyTransitionDelay;
    159     case CSSPropertyWebkitTransitionDuration:
    160         return CSSPropertyTransitionDuration;
    161     case CSSPropertyWebkitTransitionProperty:
    162         return CSSPropertyTransitionProperty;
    163     case CSSPropertyWebkitTransitionTimingFunction:
    164         return CSSPropertyTransitionTimingFunction;
    165     case CSSPropertyWebkitTransition:
    166         return CSSPropertyTransition;
    167     default:
    168         return propertyID;
    169     }
    170 }
    171 
    172106} // namespace WebCore
    173107

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

    r205292 r205809  
    353353transition-property [AnimationProperty, NameForMethods=Property]
    354354transition-timing-function [AnimationProperty, NameForMethods=TimingFunction]
    355 
    356355unicode-bidi
    357356unicode-range [SkipBuilder]
    … …  
    373372alt [NameForMethods=ContentAltText, Custom=Value]
    374373-webkit-alt = alt
    375 -webkit-animation [Longhands=-webkit-animation-name|-webkit-animation-duration|-webkit-animation-timing-function|-webkit-animation-delay|-webkit-animation-iteration-count|-webkit-animation-direction|-webkit-animation-fill-mode|-webkit-animation-play-state]
    376 -webkit-animation-delay [AnimationProperty, NameForMethods=Delay]
    377 -webkit-animation-direction [AnimationProperty, NameForMethods=Direction]
    378 -webkit-animation-duration [AnimationProperty, NameForMethods=Duration]
    379 -webkit-animation-fill-mode [AnimationProperty, NameForMethods=FillMode]
    380 -webkit-animation-iteration-count [AnimationProperty, NameForMethods=IterationCount]
    381 -webkit-animation-name [AnimationProperty, NameForMethods=Name]
    382 -webkit-animation-play-state [AnimationProperty, NameForMethods=PlayState]
    383 -webkit-animation-timing-function [AnimationProperty, NameForMethods=TimingFunction]
     374-webkit-animation = animation
     375-webkit-animation-delay = animation-delay
     376-webkit-animation-direction = animation-direction
     377-webkit-animation-duration = animation-duration
     378-webkit-animation-fill-mode = animation-fill-mode
     379-webkit-animation-iteration-count = animation-iteration-count
     380-webkit-animation-name = animation-name
     381-webkit-animation-play-state = animation-play-state
     382-webkit-animation-timing-function = animation-timing-function
    384383#if defined(ENABLE_CSS_ANIMATIONS_LEVEL_2) && ENABLE_CSS_ANIMATIONS_LEVEL_2
    385384-webkit-animation-trigger [AnimationProperty, NameForMethods=Trigger]
    … …  
    623622-webkit-text-stroke-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
    624623-webkit-text-stroke-width [Inherited, Converter=TextStrokeWidth]
     624
    625625transform [Converter=Transform]
    626626-webkit-transform = transform
    … …  
    636636// Keeping -webkit-transform-style around is how we'll detect legacy content. At that point we'll have to add a custom builder and a new ETransformStyle3D type.
    637637-webkit-transform-style [NameForMethods=TransformStyle3D]
    638 -webkit-transition [Longhands=-webkit-transition-property|-webkit-transition-duration|-webkit-transition-timing-function|-webkit-transition-delay]
    639 -webkit-transition-delay [AnimationProperty, NameForMethods=Delay]
    640 -webkit-transition-duration [AnimationProperty, NameForMethods=Duration]
    641 -webkit-transition-property [AnimationProperty, NameForMethods=Property]
    642 -webkit-transition-timing-function [AnimationProperty, NameForMethods=TimingFunction]
     638-webkit-transition = transition
     639-webkit-transition-delay = transition-delay
     640-webkit-transition-duration = transition-duration
     641-webkit-transition-property = transition-property
     642-webkit-transition-timing-function = transition-timing-function
    643643-webkit-user-drag
    644644-webkit-user-modify [Inherited]

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

    r205421 r205809  
    317317void CSSToStyleMap::mapAnimationDelay(Animation& animation, const CSSValue& value)
    318318{
    319     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDelay)) {
     319    if (value.treatAsInitialValue(CSSPropertyAnimationDelay)) {
    320320        animation.setDelay(Animation::initialDelay());
    321321        return;
    … …  
    330330void CSSToStyleMap::mapAnimationDirection(Animation& layer, const CSSValue& value)
    331331{
    332     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDirection)) {
     332    if (value.treatAsInitialValue(CSSPropertyAnimationDirection)) {
    333333        layer.setDirection(Animation::initialDirection());
    334334        return;
    … …  
    358358void CSSToStyleMap::mapAnimationDuration(Animation& animation, const CSSValue& value)
    359359{
    360     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDuration)) {
     360    if (value.treatAsInitialValue(CSSPropertyAnimationDuration)) {
    361361        animation.setDuration(Animation::initialDuration());
    362362        return;
    … …  
    371371void CSSToStyleMap::mapAnimationFillMode(Animation& layer, const CSSValue& value)
    372372{
    373     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationFillMode)) {
     373    if (value.treatAsInitialValue(CSSPropertyAnimationFillMode)) {
    374374        layer.setFillMode(Animation::initialFillMode());
    375375        return;
    … …  
    399399void CSSToStyleMap::mapAnimationIterationCount(Animation& animation, const CSSValue& value)
    400400{
    401     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationIterationCount)) {
     401    if (value.treatAsInitialValue(CSSPropertyAnimationIterationCount)) {
    402402        animation.setIterationCount(Animation::initialIterationCount());
    403403        return;
    … …  
    416416void CSSToStyleMap::mapAnimationName(Animation& layer, const CSSValue& value)
    417417{
    418     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationName)) {
     418    if (value.treatAsInitialValue(CSSPropertyAnimationName)) {
    419419        layer.setName(Animation::initialName());
    420420        return;
    … …  
    433433void CSSToStyleMap::mapAnimationPlayState(Animation& layer, const CSSValue& value)
    434434{
    435     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationPlayState)) {
     435    if (value.treatAsInitialValue(CSSPropertyAnimationPlayState)) {
    436436        layer.setPlayState(Animation::initialPlayState());
    437437        return;
    … …  
    447447void CSSToStyleMap::mapAnimationProperty(Animation& animation, const CSSValue& value)
    448448{
    449     if (value.treatAsInitialValue(CSSPropertyWebkitAnimation)) {
     449    if (value.treatAsInitialValue(CSSPropertyAnimation)) {
    450450        animation.setAnimationMode(Animation::AnimateAll);
    451451        animation.setProperty(CSSPropertyInvalid);
    … …  
    471471void CSSToStyleMap::mapAnimationTimingFunction(Animation& animation, const CSSValue& value)
    472472{
    473     if (value.treatAsInitialValue(CSSPropertyWebkitAnimationTimingFunction)) {
     473    if (value.treatAsInitialValue(CSSPropertyAnimationTimingFunction)) {
    474474        animation.setTimingFunction(Animation::initialTimingFunction());
    475475        return;

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

    r204052 r205809  
    272272        return value;
    273273
    274     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
    275     if (prefixingVariant != propertyID)
    276         return m_propertySet->getPropertyCSSValue(prefixingVariant);
    277 
    278274    return nullptr;
    279275}
    … …  
    284280    if (!value.isEmpty())
    285281        return value;
    286 
    287     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
    288     if (prefixingVariant != propertyID)
    289         return m_propertySet->getPropertyValue(prefixingVariant);
    290282
    291283    return String();

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

    r205660 r205809  
    209209    case CSSPropertyTransformOrigin:
    210210        return getShorthandValue(transformOriginShorthand());
    211     case CSSPropertyWebkitTransition:
    212         return getLayeredShorthandValue(webkitTransitionShorthand());
    213     case CSSPropertyWebkitAnimation:
    214         return getLayeredShorthandValue(webkitAnimationShorthand());
    215211    case CSSPropertyMarker: {
    216212        RefPtr<CSSValue> value = getPropertyCSSValueInternal(CSSPropertyMarkerStart);
    … …  
    641637        return false;
    642638
    643     bool propertiesWereRemoved = removePropertiesInSet(shorthand.properties(), shorthand.length());
    644 
    645     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
    646     if (prefixingVariant == propertyID)
    647         return propertiesWereRemoved;
    648 
    649     StylePropertyShorthand shorthandPrefixingVariant = shorthandForProperty(prefixingVariant);
    650     bool prefixedVariantPropertiesWereRemoved = removePropertiesInSet(shorthandPrefixingVariant.properties(), shorthandPrefixingVariant.length());
    651     return propertiesWereRemoved || prefixedVariantPropertiesWereRemoved;
     639    return removePropertiesInSet(shorthand.properties(), shorthand.length());
    652640}
    653641
    … …  
    977965                shorthandPropertyID = CSSPropertyTransition;
    978966                break;
    979             case CSSPropertyWebkitAnimationName:
    980             case CSSPropertyWebkitAnimationDuration:
    981             case CSSPropertyWebkitAnimationTimingFunction:
    982             case CSSPropertyWebkitAnimationDelay:
    983             case CSSPropertyWebkitAnimationIterationCount:
    984             case CSSPropertyWebkitAnimationDirection:
    985             case CSSPropertyWebkitAnimationFillMode:
    986             case CSSPropertyWebkitAnimationPlayState:
    987                 shorthandPropertyID = CSSPropertyWebkitAnimation;
    988                 break;
    989967            case CSSPropertyFlexDirection:
    990968            case CSSPropertyFlexWrap:
    … …  
    1015993            case CSSPropertyTransformOriginZ:
    1016994                shorthandPropertyID = CSSPropertyTransformOrigin;
    1017                 break;
    1018             case CSSPropertyWebkitTransitionProperty:
    1019             case CSSPropertyWebkitTransitionDuration:
    1020             case CSSPropertyWebkitTransitionTimingFunction:
    1021             case CSSPropertyWebkitTransitionDelay:
    1022                 shorthandPropertyID = CSSPropertyWebkitTransition;
    1023995                break;
    1024996            default:

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

    r201559 r205809  
    3333}
    3434
    35 StylePropertyShorthand animationShorthandForParsing(CSSPropertyID propId)
     35StylePropertyShorthand animationShorthandForParsing()
    3636{
    3737    // Animation-name must come last, so that keywords for other properties in the shorthand
    … …  
    4848    };
    4949
    50     static const CSSPropertyID prefixedAnimationPropertiesForParsing[] = {
    51         CSSPropertyWebkitAnimationDuration,
    52         CSSPropertyWebkitAnimationTimingFunction,
    53         CSSPropertyWebkitAnimationDelay,
    54         CSSPropertyWebkitAnimationIterationCount,
    55         CSSPropertyWebkitAnimationDirection,
    56         CSSPropertyWebkitAnimationFillMode,
    57         CSSPropertyWebkitAnimationPlayState,
    58         CSSPropertyWebkitAnimationName
    59     };
    60 
    61     if (propId == CSSPropertyAnimation)
    62         return StylePropertyShorthand(CSSPropertyAnimation, animationPropertiesForParsing);
    63     return StylePropertyShorthand(CSSPropertyWebkitAnimation, prefixedAnimationPropertiesForParsing);
     50    return StylePropertyShorthand(CSSPropertyAnimation, animationPropertiesForParsing);
    6451}
    6552

  • trunk/Source/WebCore/css/StylePropertyShorthand.h

    r201559 r205809  
    5353
    5454// Custom StylePropertyShorthand functions.
    55 StylePropertyShorthand animationShorthandForParsing(CSSPropertyID);
     55StylePropertyShorthand animationShorthandForParsing();
    5656StylePropertyShorthand borderAbridgedShorthand();
    5757

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

    r205701 r205809  
    494494        // Timing-function within keyframes is special, because it is not animated; it just
    495495        // describes the timing function between this keyframe and the next.
    496         if (property != CSSPropertyWebkitAnimationTimingFunction && property != CSSPropertyAnimationTimingFunction)
     496        if (property != CSSPropertyAnimationTimingFunction)
    497497            keyframeValue.addProperty(property);
    498498    }

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

    r205807 r205809  
    27222722    case CSSPropertyAnimationIterationCount:
    27232723    case CSSPropertyAnimationTimingFunction:
    2724     case CSSPropertyWebkitAnimationDelay:
    2725     case CSSPropertyWebkitAnimationDirection:
    2726     case CSSPropertyWebkitAnimationDuration:
    2727     case CSSPropertyWebkitAnimationFillMode:
    2728     case CSSPropertyWebkitAnimationName:
    2729     case CSSPropertyWebkitAnimationPlayState:
    2730     case CSSPropertyWebkitAnimationIterationCount:
    2731     case CSSPropertyWebkitAnimationTimingFunction:
    27322724#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
    27332725    case CSSPropertyWebkitAnimationTrigger:
    … …  
    27362728    case CSSPropertyTransitionDuration:
    27372729    case CSSPropertyTransitionTimingFunction:
    2738     case CSSPropertyTransitionProperty:
    2739     case CSSPropertyWebkitTransitionDelay:
    2740     case CSSPropertyWebkitTransitionDuration:
    2741     case CSSPropertyWebkitTransitionTimingFunction:
    2742     case CSSPropertyWebkitTransitionProperty: {
     2730    case CSSPropertyTransitionProperty: {
    27432731        RefPtr<CSSValue> val;
    27442732        AnimationParseContext context;
    … …  
    30713059        return parseShorthand(propId, webkitTextStrokeShorthand(), important);
    30723060    case CSSPropertyAnimation:
    3073     case CSSPropertyWebkitAnimation:
    30743061        return parseAnimationShorthand(propId, important);
    30753062    case CSSPropertyTransition:
    3076     case CSSPropertyWebkitTransition:
    30773063        return parseTransitionShorthand(propId, important);
    30783064    case CSSPropertyInvalid:
    … …  
    37913777bool CSSParser::parseAnimationShorthand(CSSPropertyID propId, bool important)
    37923778{
    3793     ASSERT(propId == CSSPropertyAnimation || propId == CSSPropertyWebkitAnimation);
     3779    ASSERT(propId == CSSPropertyAnimation);
    37943780
    37953781    const unsigned numProperties = 8;
    3796     const StylePropertyShorthand& shorthand = animationShorthandForParsing(propId);
     3782    const StylePropertyShorthand& shorthand = animationShorthandForParsing();
    37973783
    37983784    // The list of properties in the shorthand should be the same
    … …  
    38013787    ASSERT(numProperties == shorthand.length());
    38023788    ASSERT(numProperties == animationShorthand().length());
    3803     ASSERT(numProperties == webkitAnimationShorthand().length());
    38043789
    38053790    ShorthandScope scope(this, propId);
    … …  
    38593844    // unprefixed values.
    38603845    for (i = 0; i < numProperties; ++i)
    3861         addPropertyWithPrefixingVariant(shorthand.properties()[i], WTFMove(values[i]), important);
     3846        addProperty(shorthand.properties()[i], WTFMove(values[i]), important);
    38623847
    38633848    return true;
    38643849}
    3865 
    3866 void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important, bool implicit)
    3867 {
    3868     addProperty(propId, value.copyRef(), important, implicit);
    3869 
    3870     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propId);
    3871     if (prefixingVariant == propId)
    3872         return;
    3873 
    3874     if (m_currentShorthand) {
    3875         // We can't use ShorthandScope here as we can already be inside one (e.g we are parsing CSSTransition).
    3876         m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
    3877         addProperty(prefixingVariant, WTFMove(value), important, implicit);
    3878         m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
    3879     } else
    3880         addProperty(prefixingVariant, WTFMove(value), important, implicit);
    3881 }
    3882 
    38833850
    38843851RefPtr<CSSPrimitiveValue> CSSParser::parseColumnWidth()
    … …  
    40133980    // unprefixed values.
    40143981    for (i = 0; i < numProperties; ++i)
    4015         addPropertyWithPrefixingVariant(shorthand.properties()[i], WTFMove(values[i]), important);
     3982        addProperty(shorthand.properties()[i], WTFMove(values[i]), important);
    40163983
    40173984    return true;
    … …  
    53825349            switch (propId) {
    53835350            case CSSPropertyAnimationDelay:
    5384             case CSSPropertyWebkitAnimationDelay:
    53855351            case CSSPropertyTransitionDelay:
    5386             case CSSPropertyWebkitTransitionDelay:
    53875352                currValue = parseAnimationDelay();
    53885353                if (currValue)
    … …  
    53905355                break;
    53915356            case CSSPropertyAnimationDirection:
    5392             case CSSPropertyWebkitAnimationDirection:
    53935357                currValue = parseAnimationDirection();
    53945358                if (currValue)
    … …  
    53965360                break;
    53975361            case CSSPropertyAnimationDuration:
    5398             case CSSPropertyWebkitAnimationDuration:
    53995362            case CSSPropertyTransitionDuration:
    5400             case CSSPropertyWebkitTransitionDuration:
    54015363                currValue = parseAnimationDuration();
    54025364                if (currValue)
    … …  
    54045366                break;
    54055367            case CSSPropertyAnimationFillMode:
    5406             case CSSPropertyWebkitAnimationFillMode:
    54075368                currValue = parseAnimationFillMode();
    54085369                if (currValue)
    … …  
    54105371                break;
    54115372            case CSSPropertyAnimationIterationCount:
    5412             case CSSPropertyWebkitAnimationIterationCount:
    54135373                currValue = parseAnimationIterationCount();
    54145374                if (currValue)
    … …  
    54165376                break;
    54175377            case CSSPropertyAnimationName:
    5418             case CSSPropertyWebkitAnimationName:
    54195378                currValue = parseAnimationName();
    54205379                if (currValue)
    … …  
    54225381                break;
    54235382            case CSSPropertyAnimationPlayState:
    5424             case CSSPropertyWebkitAnimationPlayState:
    54255383                currValue = parseAnimationPlayState();
    54265384                if (currValue)
    … …  
    54285386                break;
    54295387            case CSSPropertyTransitionProperty:
    5430             case CSSPropertyWebkitTransitionProperty:
    54315388                currValue = parseAnimationProperty(context);
    54325389                if (value && !context.animationPropertyKeywordAllowed())
    … …  
    54365393                break;
    54375394            case CSSPropertyAnimationTimingFunction:
    5438             case CSSPropertyWebkitAnimationTimingFunction:
    54395395            case CSSPropertyTransitionTimingFunction:
    5440             case CSSPropertyWebkitTransitionTimingFunction:
    54415396                currValue = parseAnimationTimingFunction();
    54425397                if (currValue)

  • trunk/Source/WebCore/css/parser/CSSParser.h

    r205660 r205809  
    146146    std::unique_ptr<MediaQuery> parseMediaQuery(const String&);
    147147
    148     void addPropertyWithPrefixingVariant(CSSPropertyID, RefPtr<CSSValue>&&, bool important, bool implicit = false);
    149148    void addProperty(CSSPropertyID, RefPtr<CSSValue>&&, bool important, bool implicit = false);
    150149    void rollbackLastProperties(int num);

  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r205249 r205809  
    191191    double duration = document().page() ? document().page()->theme().mediaControlsFadeInDuration() : 0;
    192192
    193     setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
    194     setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
     193    setInlineStyleProperty(CSSPropertyTransitionProperty, CSSPropertyOpacity);
     194    setInlineStyleProperty(CSSPropertyTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
    195195    setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::CSS_NUMBER);
    196196
    … …  
    208208    double duration = document().page() ? document().page()->theme().mediaControlsFadeOutDuration() : 0;
    209209
    210     setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
    211     setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
     210    setInlineStyleProperty(CSSPropertyTransitionProperty, CSSPropertyOpacity);
     211    setInlineStyleProperty(CSSPropertyTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
    212212    setInlineStyleProperty(CSSPropertyOpacity, 0.0, CSSPrimitiveValue::CSS_NUMBER);
    213213
Note: See TracChangeset for help on using the changeset viewer.