⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 181825 in webkit


Ignore:
Timestamp:
Mar 21, 2015, 12:37:07 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r181824.
​https://bugs.webkit.org/show_bug.cgi?id=142935

Broke Windows build (Requested by ap on #webkit).

Reverted changeset:

"Remove the prefix for CSS Transforms"
​https://bugs.webkit.org/show_bug.cgi?id=142927
​http://trac.webkit.org/changeset/181824

Location:
trunk
Files:
5 deleted
37 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r181824 r181825  
     12015-03-21  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r181824.
     4        https://bugs.webkit.org/show_bug.cgi?id=142935
     5
     6        Broke Windows build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Remove the prefix for CSS Transforms"
     11        https://bugs.webkit.org/show_bug.cgi?id=142927
     12        http://trac.webkit.org/changeset/181824
     13
    1142015-03-20  Dean Jackson  <dino@apple.com>
    215

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

    r181824 r181825  
    9292text-transform: none;
    9393top: auto;
    94 transform: none;
    95 transform-origin: 392px 288px;
    96 transform-style: flat;
    9794unicode-bidi: normal;
    9895vertical-align: baseline;
    … …  
    198195-webkit-nbsp-mode: normal;
    199196order: 0;
    200 perspective: none;
    201 perspective-origin: 392px 288px;
     197-webkit-perspective: none;
     198-webkit-perspective-origin: 392px 288px;
    202199-webkit-print-color-adjust: economy;
    203200-webkit-rtl-ordering: logical;
    … …  
    212209-webkit-text-stroke-color: rgb(0, 0, 0);
    213210-webkit-text-stroke-width: 0px;
     211-webkit-transform: none;
     212-webkit-transform-origin: 392px 288px;
    214213-webkit-transform-style: flat;
    215214-webkit-transition-delay: 0s;

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

    r181824 r181825  
    9191text-transform: none
    9292top: auto
    93 transform: none
    94 transform-origin: 50% 50%
    95 transform-style: flat
    9693unicode-bidi: normal
    9794vertical-align: baseline
    … …  
    197194-webkit-nbsp-mode: normal
    198195order: 0
    199 perspective: none
    200 perspective-origin: 50% 50%
     196-webkit-perspective: none
     197-webkit-perspective-origin: 50% 50%
    201198-webkit-print-color-adjust: economy
    202199-webkit-rtl-ordering: logical
    … …  
    211208-webkit-text-stroke-color: rgb(0, 0, 0)
    212209-webkit-text-stroke-width: 0px
     210-webkit-transform: none
     211-webkit-transform-origin: 50% 50%
    213212-webkit-transform-style: flat
    214213-webkit-transition-delay: 0s

  • trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js

    r181824 r181825  
    9595    "-webkit-nbsp-mode": true,
    9696    "order": true,
    97     "perspective": true,
    98     "perspective-origin": true,
     97    "-webkit-perspective": true,
     98    "-webkit-perspective-origin": true,
    9999    "-webkit-print-color-adjust": true,
    100100    "-webkit-rtl-ordering": true,
    … …  
    110110    "-webkit-text-stroke-color": true,
    111111    "-webkit-text-stroke-width": true,
    112     "transform": true,
    113     "transform-origin": true,
    114     "transform-style": true,
     112    "-webkit-transform": true,
     113    "-webkit-transform-origin": true,
    115114    "-webkit-transform-style": true,
    116115    "-webkit-transition-delay": true,

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

    r181824 r181825  
    181181rect: style.getPropertyValue(top) : auto
    182182rect: style.getPropertyCSSValue(top) : [object CSSPrimitiveValue]
    183 rect: style.getPropertyValue(transform) : none
    184 rect: style.getPropertyCSSValue(transform) : [object CSSPrimitiveValue]
    185 rect: style.getPropertyValue(transform-origin) : 0px 0px
    186 rect: style.getPropertyCSSValue(transform-origin) : [object CSSValueList]
    187 rect: style.getPropertyValue(transform-style) : flat
    188 rect: style.getPropertyCSSValue(transform-style) : [object CSSPrimitiveValue]
    189183rect: style.getPropertyValue(unicode-bidi) : normal
    190184rect: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
    … …  
    393387rect: style.getPropertyValue(order) : 0
    394388rect: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
    395 rect: style.getPropertyValue(perspective) : none
    396 rect: style.getPropertyCSSValue(perspective) : [object CSSPrimitiveValue]
    397 rect: style.getPropertyValue(perspective-origin) : 0px 0px
    398 rect: style.getPropertyCSSValue(perspective-origin) : [object CSSValueList]
     389rect: style.getPropertyValue(-webkit-perspective) : none
     390rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     391rect: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
     392rect: style.getPropertyCSSValue(-webkit-perspective-origin) : [object CSSValueList]
    399393rect: style.getPropertyValue(-webkit-print-color-adjust) : economy
    400394rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
    … …  
    421415rect: style.getPropertyValue(-webkit-text-stroke-width) : 0px
    422416rect: style.getPropertyCSSValue(-webkit-text-stroke-width) : [object CSSPrimitiveValue]
     417rect: style.getPropertyValue(-webkit-transform) : none
     418rect: style.getPropertyCSSValue(-webkit-transform) : [object CSSPrimitiveValue]
     419rect: style.getPropertyValue(-webkit-transform-origin) : 0px 0px
     420rect: style.getPropertyCSSValue(-webkit-transform-origin) : [object CSSValueList]
    423421rect: style.getPropertyValue(-webkit-transform-style) : flat
    424422rect: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]
    … …  
    695693g: style.getPropertyValue(top) : auto
    696694g: style.getPropertyCSSValue(top) : [object CSSPrimitiveValue]
    697 g: style.getPropertyValue(transform) : none
    698 g: style.getPropertyCSSValue(transform) : [object CSSPrimitiveValue]
    699 g: style.getPropertyValue(transform-origin) : 0px 0px
    700 g: style.getPropertyCSSValue(transform-origin) : [object CSSValueList]
    701 g: style.getPropertyValue(transform-style) : flat
    702 g: style.getPropertyCSSValue(transform-style) : [object CSSPrimitiveValue]
    703695g: style.getPropertyValue(unicode-bidi) : normal
    704696g: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
    … …  
    907899g: style.getPropertyValue(order) : 0
    908900g: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
    909 g: style.getPropertyValue(perspective) : none
    910 g: style.getPropertyCSSValue(perspective) : [object CSSPrimitiveValue]
    911 g: style.getPropertyValue(perspective-origin) : 0px 0px
    912 g: style.getPropertyCSSValue(perspective-origin) : [object CSSValueList]
     901g: style.getPropertyValue(-webkit-perspective) : none
     902g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     903g: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
     904g: style.getPropertyCSSValue(-webkit-perspective-origin) : [object CSSValueList]
    913905g: style.getPropertyValue(-webkit-print-color-adjust) : economy
    914906g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
    … …  
    935927g: style.getPropertyValue(-webkit-text-stroke-width) : 0px
    936928g: style.getPropertyCSSValue(-webkit-text-stroke-width) : [object CSSPrimitiveValue]
     929g: style.getPropertyValue(-webkit-transform) : none
     930g: style.getPropertyCSSValue(-webkit-transform) : [object CSSPrimitiveValue]
     931g: style.getPropertyValue(-webkit-transform-origin) : 0px 0px
     932g: style.getPropertyCSSValue(-webkit-transform-origin) : [object CSSValueList]
    937933g: style.getPropertyValue(-webkit-transform-style) : flat
    938934g: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]

  • trunk/LayoutTests/transforms/2d/computed-style-origin-expected.txt

    r181824 r181825  
    44
    55
    6 PASS test1Style.transformOrigin is '10px 10px'
    7 PASS test2Style.transformOrigin is '10px 10px'
    8 PASS test3Style.transformOrigin is '0px 20px'
    9 PASS test4Style.transformOrigin is '5px 7px'
    10 PASS test5Style.transformOrigin is '15px 15px'
    11 PASS test1Style.perspectiveOrigin is '10px 10px'
    12 PASS test2Style.perspectiveOrigin is '10px 10px'
    13 PASS test3Style.perspectiveOrigin is '0px 20px'
    14 PASS test4Style.perspectiveOrigin is '5px 7px'
    15 PASS test5Style.perspectiveOrigin is '15px 15px'
    16 PASS test6Style.perspectiveOrigin is '50px 50px'
     6PASS test1Style.webkitTransformOrigin is '10px 10px'
     7PASS test2Style.webkitTransformOrigin is '10px 10px'
     8PASS test3Style.webkitTransformOrigin is '0px 20px'
     9PASS test4Style.webkitTransformOrigin is '5px 7px'
     10PASS test5Style.webkitTransformOrigin is '15px 15px'
     11PASS test1Style.webkitPerspectiveOrigin is '10px 10px'
     12PASS test2Style.webkitPerspectiveOrigin is '10px 10px'
     13PASS test3Style.webkitPerspectiveOrigin is '0px 20px'
     14PASS test4Style.webkitPerspectiveOrigin is '5px 7px'
     15PASS test5Style.webkitPerspectiveOrigin is '15px 15px'
     16PASS test6Style.webkitPerspectiveOrigin is '50px 50px'
    1717
    1818PASS successfullyParsed is true

  • trunk/LayoutTests/transforms/2d/computed-style-origin.html

    r181824 r181825  
    77        background-color: blue;
    88        position: relative;
    9         transform: translate(0);
     9        -webkit-transform: translate(0);
    1010        // default transform and perspective origin
    1111    }
    … …  
    1515        background-color: blue;
    1616        position: relative;
    17         transform: translate(0);
    18         transform-origin: 50% 50%;
    19         perspective-origin: 50% 50%;
     17        -webkit-transform: translate(0);
     18        -webkit-transform-origin: 50% 50%;
     19        -webkit-perspective-origin: 50% 50%;
    2020    }
    2121    #test3 {
    … …  
    2424        background-color: blue;
    2525        position: relative;
    26         transform: translate(0);
    27         transform-origin: 0% 100%;
    28         perspective-origin: 0% 100%;
     26        -webkit-transform: translate(0);
     27        -webkit-transform-origin: 0% 100%;
     28        -webkit-perspective-origin: 0% 100%;
    2929    }
    3030    #test4 {
    … …  
    3333        background-color: blue;
    3434        position: relative;
    35         transform: translate(0);
    36         transform-origin: 5px 7px;
    37         perspective-origin: 5px 7px;
     35        -webkit-transform: translate(0);
     36        -webkit-transform-origin: 5px 7px;
     37        -webkit-perspective-origin: 5px 7px;
    3838    }
    3939    #test5 {
    … …  
    4545        background-color: blue;
    4646        position: relative;
    47         transform: translate(0);
    48         transform-origin: 50% 50%;
    49         perspective-origin: 50% 50%;
     47        -webkit-transform: translate(0);
     48        -webkit-transform-origin: 50% 50%;
     49        -webkit-perspective-origin: 50% 50%;
    5050    }
    5151    #test6 {
    … …  
    5454        background-color: blue;
    5555        position: relative;
    56         transform: translate(0);
    57         perspective-origin: 10% 20% 30%;
     56        -webkit-transform: translate(0);
     57        -webkit-perspective-origin: 10% 20% 30%;
    5858    }
    5959
    … …  
    8888var test6Style = window.getComputedStyle(test6);
    8989
    90 shouldBe("test1Style.transformOrigin", "'10px 10px'");
    91 shouldBe("test2Style.transformOrigin", "'10px 10px'");
    92 shouldBe("test3Style.transformOrigin", "'0px 20px'");
    93 shouldBe("test4Style.transformOrigin", "'5px 7px'");
    94 shouldBe("test5Style.transformOrigin", "'15px 15px'");
     90shouldBe("test1Style.webkitTransformOrigin", "'10px 10px'");
     91shouldBe("test2Style.webkitTransformOrigin", "'10px 10px'");
     92shouldBe("test3Style.webkitTransformOrigin", "'0px 20px'");
     93shouldBe("test4Style.webkitTransformOrigin", "'5px 7px'");
     94shouldBe("test5Style.webkitTransformOrigin", "'15px 15px'");
    9595
    96 shouldBe("test1Style.perspectiveOrigin", "'10px 10px'");
    97 shouldBe("test2Style.perspectiveOrigin", "'10px 10px'");
    98 shouldBe("test3Style.perspectiveOrigin", "'0px 20px'");
    99 shouldBe("test4Style.perspectiveOrigin", "'5px 7px'");
    100 shouldBe("test5Style.perspectiveOrigin", "'15px 15px'");
    101 shouldBe("test6Style.perspectiveOrigin", "'50px 50px'");
     96shouldBe("test1Style.webkitPerspectiveOrigin", "'10px 10px'");
     97shouldBe("test2Style.webkitPerspectiveOrigin", "'10px 10px'");
     98shouldBe("test3Style.webkitPerspectiveOrigin", "'0px 20px'");
     99shouldBe("test4Style.webkitPerspectiveOrigin", "'5px 7px'");
     100shouldBe("test5Style.webkitPerspectiveOrigin", "'15px 15px'");
     101shouldBe("test6Style.webkitPerspectiveOrigin", "'50px 50px'");
    102102
    103103debug("");

  • trunk/LayoutTests/transforms/2d/resources/transform-test-utils.js

    r181824 r181825  
    4242  var testBox = document.getElementById('test-box');
    4343  var resultsBox = document.getElementById('results');
    44 
     44 
    4545  gTests.forEach(function(curTest) {
    46     testBox.style.transform = 'none'; // reset the transform just in case the next step fails
    47     testBox.style.transform = curTest.transform;
    48     var computedTransform = window.getComputedStyle(testBox).transform;
     46    testBox.style.webkitTransform = 'none'; // reset the transform just in case the next step fails
     47    testBox.style.webkitTransform = curTest.transform;
     48    var computedTransform = window.getComputedStyle(testBox).webkitTransform;
    4949
    5050    var success = compareMatrices(computedTransform, curTest.result);

  • trunk/LayoutTests/transitions/transition-end-event-multiple-04-expected.txt

    r181824 r181825  
    11Initiating transitions on transform properties of all boxes, starting at different times and with different durations and values.
    22
    3 PASS --- [Expected] Property: transform Target: box1 Elapsed Time: 0.5
    4 PASS --- [Expected] Property: transform Target: box2 Elapsed Time: 0.55
    5 PASS --- [Expected] Property: transform Target: box4 Elapsed Time: 0.4
     3PASS --- [Expected] Property: -webkit-transform Target: box1 Elapsed Time: 0.5
     4PASS --- [Expected] Property: -webkit-transform Target: box2 Elapsed Time: 0.55
     5PASS --- [Expected] Property: -webkit-transform Target: box4 Elapsed Time: 0.4
    66

  • trunk/LayoutTests/transitions/transition-end-event-multiple-04.html

    r181824 r181825  
    99      margin: 10px;
    1010      background-color: blue;
    11       transform: translate(0);
    12       transition-property: transform;
    13       transition-duration: 0.5s;
     11      -webkit-transform: translate(0);
     12      -webkit-transition-property: -webkit-transform;
     13      -webkit-transition-duration: 0.5s;
    1414    }
    1515   
    1616    .box1 {
    17       transform: translate(50px);
     17      -webkit-transform: translate(50px);
    1818    }
    1919   
    2020    .box2 {
    21       transform: translate(50px) scale(1.05);
    22       transition-duration: 0.55s;
     21      -webkit-transform: translate(50px) scale(1.05);
     22      -webkit-transition-duration: 0.55s;
    2323    }
    2424   
    2525    .box3 {
    26       transform: translate(0); /* same as default */
    27       transition-duration: 0.3s;
     26      -webkit-transform: translate(0); /* same as default */
     27      -webkit-transition-duration: 0.3s;
    2828    }
    2929
    3030    .box4 {
    31       transform: translate(100px);
    32       transition-duration: 0.4s;
     31      -webkit-transform: translate(100px);
     32      -webkit-transition-duration: 0.4s;
    3333    }
    3434
    … …  
    4343    var expectedEndEvents = [
    4444      // [property-name, element-id, elapsed-time, listen]
    45       ["transform", "box1", 0.5, false],
    46       ["transform", "box2", 0.55, false],
    47       ["transform", "box4", 0.4, false]
     45      ["-webkit-transform", "box1", 0.5, false],
     46      ["-webkit-transform", "box2", 0.55, false],
     47      ["-webkit-transform", "box4", 0.4, false]
    4848    ];
    4949 

  • trunk/LayoutTests/transitions/transition-end-event-transform-expected.txt

    r181824 r181825  
    11Initiating a 500ms transition on the transform property of box1.
    22
    3 PASS --- [Expected] Property: transform Target: box1 Elapsed Time: 0.5
     3PASS --- [Expected] Property: -webkit-transform Target: box1 Elapsed Time: 0.5
    44

  • trunk/LayoutTests/transitions/transition-end-event-transform.html

    r181824 r181825  
    99      margin: 10px;
    1010      background-color: blue;
    11       transition-property: ransform;
    12       transition-duration: 0.5s;
    13       transform: translate(100px);
     11      -webkit-transition-property: -webkit-transform;
     12      -webkit-transition-duration: 0.5s;
     13      -webkit-transform: translate(100px);
    1414    }
    1515  </style>
    … …  
    1919    var expectedEndEvents = [
    2020      // [property-name, element-id, elapsed-time, listen]
    21       ["transform", "box1", 0.5, true]
     21      ["-webkit-transform", "box1", 0.5, true]
    2222    ];
    2323   
    … …  
    2525    {
    2626      var box = document.getElementById('box1');
    27       box.style.transform = 'translate(200px)';
     27      box.style.webkitTransform = 'translate(200px)';
    2828    }
    2929   

  • trunk/Source/WebCore/ChangeLog

    r181824 r181825  
     12015-03-21  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r181824.
     4        https://bugs.webkit.org/show_bug.cgi?id=142935
     5
     6        Broke Windows build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Remove the prefix for CSS Transforms"
     11        https://bugs.webkit.org/show_bug.cgi?id=142927
     12        http://trac.webkit.org/changeset/181824
     13
    1142015-03-20  Dean Jackson  <dino@apple.com>
    215

  • trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

    r181824 r181825  
    331331    case CSSPropertyRight:
    332332    case CSSPropertyTop:
    333     case CSSPropertyTransform:
     333    case CSSPropertyWebkitTransform:
    334334        return false;
    335335    default:

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

    r181824 r181825  
    216216    CSSPropertyTextTransform,
    217217    CSSPropertyTop,
    218     CSSPropertyTransform,
    219     CSSPropertyTransformOrigin,
    220     CSSPropertyTransformStyle,
    221218    CSSPropertyTransitionDelay,
    222219    CSSPropertyTransitionDuration,
    … …  
    366363    CSSPropertyWebkitOverflowScrolling,
    367364#endif
    368     CSSPropertyPerspective,
    369     CSSPropertyPerspectiveOrigin,
     365    CSSPropertyWebkitPerspective,
     366    CSSPropertyWebkitPerspectiveOrigin,
    370367    CSSPropertyWebkitPrintColorAdjust,
    371368    CSSPropertyWebkitRtlOrdering,
    … …  
    392389    CSSPropertyWebkitTextStrokeColor,
    393390    CSSPropertyWebkitTextStrokeWidth,
     391    CSSPropertyWebkitTransform,
     392    CSSPropertyWebkitTransformOrigin,
    394393    CSSPropertyWebkitTransformStyle,
    395394    CSSPropertyWebkitTransitionDelay,
    … …  
    16391638    case CSSPropertyWebkitGridTemplateRows:
    16401639#endif
    1641     case CSSPropertyPerspectiveOrigin:
    1642     case CSSPropertyTransformOrigin:
    1643     case CSSPropertyTransform:
     1640    case CSSPropertyWebkitPerspectiveOrigin:
     1641    case CSSPropertyWebkitTransformOrigin:
     1642    case CSSPropertyWebkitTransform:
    16441643    case CSSPropertyWebkitFilter:
    16451644#if ENABLE(FILTERS_LEVEL_2)
    … …  
    28202819            return cssValuePool().createIdentifierValue(CSSValueTouch);
    28212820#endif
    2822         case CSSPropertyPerspective:
     2821        case CSSPropertyWebkitPerspective:
    28232822            if (!style->hasPerspective())
    28242823                return cssValuePool().createIdentifierValue(CSSValueNone);
    28252824            return zoomAdjustedPixelValue(style->perspective(), style.get());
    2826         case CSSPropertyPerspectiveOrigin: {
     2825        case CSSPropertyWebkitPerspectiveOrigin: {
    28272826            RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
    28282827            if (renderer) {
    … …  
    28752874        case CSSPropertySpeak:
    28762875            return cssValuePool().createValue(style->speak());
    2877         case CSSPropertyTransform:
     2876        case CSSPropertyWebkitTransform:
    28782877            return computedTransform(renderer, style.get());
    2879         case CSSPropertyTransformOrigin: {
     2878        case CSSPropertyWebkitTransformOrigin: {
    28802879            RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
    28812880            if (renderer) {
    … …  
    28962895            return list.release();
    28972896        }
    2898         case CSSPropertyTransformStyle:
    28992897        case CSSPropertyWebkitTransformStyle:
    29002898            return cssValuePool().createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat);
    … …  
    31883186        case CSSPropertyWebkitMaskRepeatX:
    31893187        case CSSPropertyWebkitMaskRepeatY:
    3190         case CSSPropertyPerspectiveOriginX:
    3191         case CSSPropertyPerspectiveOriginY:
     3188        case CSSPropertyWebkitPerspectiveOriginX:
     3189        case CSSPropertyWebkitPerspectiveOriginY:
    31923190        case CSSPropertyWebkitTextStroke:
    3193         case CSSPropertyTransformOriginX:
    3194         case CSSPropertyTransformOriginY:
    3195         case CSSPropertyTransformOriginZ:
     3191        case CSSPropertyWebkitTransformOriginX:
     3192        case CSSPropertyWebkitTransformOriginY:
     3193        case CSSPropertyWebkitTransformOriginZ:
    31963194            break;
    31973195

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

    r181824 r181825  
    10151015        break;
    10161016#endif
    1017     case CSSPropertyTransformStyle:
    10181017    case CSSPropertyWebkitTransformStyle:
    10191018        if (valueID == CSSValueFlat || valueID == CSSValuePreserve3d)
    … …  
    11741173#endif // CSS3_TEXT
    11751174    case CSSPropertyWebkitTextSecurity:
    1176     case CSSPropertyTransformStyle:
    11771175    case CSSPropertyWebkitTransformStyle:
    11781176    case CSSPropertyWebkitUserDrag:
    … …  
    12541252static bool parseTranslateTransformValue(MutableStyleProperties* properties, CSSPropertyID propertyID, const String& string, bool important)
    12551253{
    1256     if (propertyID != CSSPropertyTransform)
     1254    if (propertyID != CSSPropertyWebkitTransform)
    12571255        return false;
    12581256    static const unsigned shortestValidTransformStringLength = 12;
    … …  
    12951293    RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
    12961294    result->append(transformValue.releaseNonNull());
    1297     properties->addParsedProperty(CSSProperty(CSSPropertyTransform, result.release(), important));
     1295    properties->addParsedProperty(CSSProperty(CSSPropertyWebkitTransform, result.release(), important));
    12981296    return true;
    12991297}
    … …  
    26182616        return parseRegionThread(propId, important);
    26192617#endif
    2620     case CSSPropertyTransform:
     2618    case CSSPropertyWebkitTransform:
    26212619        if (id == CSSValueNone)
    26222620            validPrimitive = true;
    … …  
    26302628        }
    26312629        break;
    2632     case CSSPropertyTransformOrigin:
    2633     case CSSPropertyTransformOriginX:
    2634     case CSSPropertyTransformOriginY:
    2635     case CSSPropertyTransformOriginZ: {
     2630    case CSSPropertyWebkitTransformOrigin:
     2631    case CSSPropertyWebkitTransformOriginX:
     2632    case CSSPropertyWebkitTransformOriginY:
     2633    case CSSPropertyWebkitTransformOriginZ: {
    26362634        RefPtr<CSSValue> val1;
    26372635        RefPtr<CSSValue> val2;
    … …  
    26482646        return false;
    26492647    }
    2650     case CSSPropertyPerspective:
     2648    case CSSPropertyWebkitPerspective:
    26512649        if (id == CSSValueNone)
    26522650            validPrimitive = true;
    … …  
    26632661        }
    26642662        break;
    2665     case CSSPropertyPerspectiveOrigin:
    2666     case CSSPropertyPerspectiveOriginX:
    2667     case CSSPropertyPerspectiveOriginY: {
     2663    case CSSPropertyWebkitPerspectiveOrigin:
     2664    case CSSPropertyWebkitPerspectiveOriginX:
     2665    case CSSPropertyWebkitPerspectiveOriginY: {
    26682666        RefPtr<CSSValue> val1;
    26692667        RefPtr<CSSValue> val2;
    … …  
    31523150#endif // CSS3_TEXT
    31533151    case CSSPropertyWebkitTextSecurity:
    3154     case CSSPropertyTransformStyle:
    31553152    case CSSPropertyWebkitTransformStyle:
    31563153    case CSSPropertyWebkitUserDrag:
    … …  
    97799776    propId2 = propId;
    97809777    propId3 = propId;
    9781     if (propId == CSSPropertyTransformOrigin) {
    9782         propId1 = CSSPropertyTransformOriginX;
    9783         propId2 = CSSPropertyTransformOriginY;
    9784         propId3 = CSSPropertyTransformOriginZ;
     9778    if (propId == CSSPropertyWebkitTransformOrigin) {
     9779        propId1 = CSSPropertyWebkitTransformOriginX;
     9780        propId2 = CSSPropertyWebkitTransformOriginY;
     9781        propId3 = CSSPropertyWebkitTransformOriginZ;
    97859782    }
    97869783
    97879784    switch (propId) {
    9788     case CSSPropertyTransformOrigin:
    9789         if (!parseTransformOriginShorthand(value, value2, value3))
     9785        case CSSPropertyWebkitTransformOrigin:
     9786            if (!parseTransformOriginShorthand(value, value2, value3))
     9787                return false;
     9788            // parseTransformOriginShorthand advances the m_valueList pointer
     9789            break;
     9790        case CSSPropertyWebkitTransformOriginX: {
     9791            value = parsePositionX(*m_valueList);
     9792            if (value)
     9793                m_valueList->next();
     9794            break;
     9795        }
     9796        case CSSPropertyWebkitTransformOriginY: {
     9797            value = parsePositionY(*m_valueList);
     9798            if (value)
     9799                m_valueList->next();
     9800            break;
     9801        }
     9802        case CSSPropertyWebkitTransformOriginZ: {
     9803            ValueWithCalculation valueWithCalculation(*m_valueList->current());
     9804            if (validateUnit(valueWithCalculation, FLength))
     9805                value = createPrimitiveNumericValue(valueWithCalculation);
     9806            if (value)
     9807                m_valueList->next();
     9808            break;
     9809        }
     9810        default:
     9811            ASSERT_NOT_REACHED();
    97909812            return false;
    9791         // parseTransformOriginShorthand advances the m_valueList pointer
    9792         break;
    9793     case CSSPropertyTransformOriginX: {
    9794         value = parsePositionX(*m_valueList);
    9795         if (value)
    9796             m_valueList->next();
    9797         break;
    9798     }
    9799     case CSSPropertyTransformOriginY: {
    9800         value = parsePositionY(*m_valueList);
    9801         if (value)
    9802             m_valueList->next();
    9803         break;
    9804     }
    9805     case CSSPropertyTransformOriginZ: {
    9806         ValueWithCalculation valueWithCalculation(*m_valueList->current());
    9807         if (validateUnit(valueWithCalculation, FLength))
    9808             value = createPrimitiveNumericValue(valueWithCalculation);
    9809         if (value)
    9810             m_valueList->next();
    9811         break;
    9812     }
    9813     default:
    9814         ASSERT_NOT_REACHED();
    9815         return false;
    98169813    }
    98179814
    … …  
    98239820    propId1 = propId;
    98249821    propId2 = propId;
    9825     if (propId == CSSPropertyPerspectiveOrigin) {
    9826         propId1 = CSSPropertyPerspectiveOriginX;
    9827         propId2 = CSSPropertyPerspectiveOriginY;
     9822    if (propId == CSSPropertyWebkitPerspectiveOrigin) {
     9823        propId1 = CSSPropertyWebkitPerspectiveOriginX;
     9824        propId2 = CSSPropertyWebkitPerspectiveOriginY;
    98289825    }
    98299826
    98309827    switch (propId) {
    9831     case CSSPropertyPerspectiveOrigin:
    9832         if (m_valueList->size() > 2)
     9828        case CSSPropertyWebkitPerspectiveOrigin:
     9829            if (m_valueList->size() > 2)
     9830                return false;
     9831            parse2ValuesFillPosition(*m_valueList, value, value2);
     9832            break;
     9833        case CSSPropertyWebkitPerspectiveOriginX: {
     9834            value = parsePositionX(*m_valueList);
     9835            if (value)
     9836                m_valueList->next();
     9837            break;
     9838        }
     9839        case CSSPropertyWebkitPerspectiveOriginY: {
     9840            value = parsePositionY(*m_valueList);
     9841            if (value)
     9842                m_valueList->next();
     9843            break;
     9844        }
     9845        default:
     9846            ASSERT_NOT_REACHED();
    98339847            return false;
    9834         parse2ValuesFillPosition(*m_valueList, value, value2);
    9835         break;
    9836     case CSSPropertyPerspectiveOriginX: {
    9837         value = parsePositionX(*m_valueList);
    9838         if (value)
    9839             m_valueList->next();
    9840         break;
    9841     }
    9842     case CSSPropertyPerspectiveOriginY: {
    9843         value = parsePositionY(*m_valueList);
    9844         if (value)
    9845             m_valueList->next();
    9846         break;
    9847     }
    9848     default:
    9849         ASSERT_NOT_REACHED();
    9850         return false;
    98519848    }
    98529849

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

    r181824 r181825  
    557557-webkit-padding-end [SkipBuilder]
    558558-webkit-padding-start [SkipBuilder]
    559 perspective [ConditionalConverter=Perspective]
    560 -webkit-perspective = perspective
    561 perspective-origin [Longhands=perspective-origin-x|perspective-origin-y]
    562 -webkit-perspective-origin = perspective-origin
    563 perspective-origin-x [Converter=Length]
    564 -webkit-perspective-origin-x = perspective-origin-x
    565 perspective-origin-y [Converter=Length]
    566 -webkit-perspective-origin-y = perspective-origin-y
     559-webkit-perspective [ConditionalConverter=Perspective]
     560-webkit-perspective-origin [Longhands=-webkit-perspective-origin-x|-webkit-perspective-origin-y]
     561-webkit-perspective-origin-x [Converter=Length]
     562-webkit-perspective-origin-y [Converter=Length]
    567563-webkit-print-color-adjust [Inherited]
    568564-webkit-rtl-ordering [Inherited, Setter=setRTLOrdering, Initial=initialRTLOrdering]
    … …  
    604600-webkit-text-stroke-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
    605601-webkit-text-stroke-width [Inherited, Converter=TextStrokeWidth]
    606 transform [Converter=Transform]
    607 -webkit-transform = transform
    608 transform-origin [Longhands=transform-origin-x|transform-origin-y|transform-origin-z]
    609 -webkit-transform-origin = transform-origin
    610 transform-origin-x [Converter=Length]
    611 -webkit-transform-origin-x = transform-origin-x
    612 transform-origin-y [Converter=Length]
    613 -webkit-transform-origin-y = transform-origin-y
    614 transform-origin-z [Converter=ComputedLength<float>]
    615 -webkit-transform-origin-z = transform-origin-z
    616 transform-style [NameForMethods=TransformStyle3D]
    617 # Keeping -webkit-transform-style around is how we'll detect legacy content. At that point
    618 # we'll have to add a custom builder and a new ETransformStyle3D type.
     602-webkit-transform [Converter=Transform]
     603-webkit-transform-origin [Longhands=-webkit-transform-origin-x|-webkit-transform-origin-y|-webkit-transform-origin-z]
     604-webkit-transform-origin-x [Converter=Length]
     605-webkit-transform-origin-y [Converter=Length]
     606-webkit-transform-origin-z [Converter=ComputedLength<float>]
    619607-webkit-transform-style [NameForMethods=TransformStyle3D]
    620608-webkit-transition [Longhands=-webkit-transition-property|-webkit-transition-duration|-webkit-transition-timing-function|-webkit-transition-delay]

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

    r181824 r181825  
    200200    case CSSPropertyWebkitTextStroke:
    201201        return getShorthandValue(webkitTextStrokeShorthand());
    202     case CSSPropertyPerspectiveOrigin:
    203         return getShorthandValue(perspectiveOriginShorthand());
    204     case CSSPropertyTransformOrigin:
    205         return getShorthandValue(transformOriginShorthand());
     202    case CSSPropertyWebkitPerspectiveOrigin:
     203        return getShorthandValue(webkitPerspectiveOriginShorthand());
     204    case CSSPropertyWebkitTransformOrigin:
     205        return getShorthandValue(webkitTransformOriginShorthand());
    206206    case CSSPropertyWebkitTransition:
    207207        return getLayeredShorthandValue(webkitTransitionShorthand());
    … …  
    929929            shorthandPropertyID = CSSPropertyWebkitMask;
    930930            break;
    931         case CSSPropertyPerspectiveOriginX:
    932         case CSSPropertyPerspectiveOriginY:
    933             shorthandPropertyID = CSSPropertyPerspectiveOrigin;
    934             break;
    935         case CSSPropertyTransformOriginX:
    936         case CSSPropertyTransformOriginY:
    937         case CSSPropertyTransformOriginZ:
    938             shorthandPropertyID = CSSPropertyTransformOrigin;
     931        case CSSPropertyWebkitPerspectiveOriginX:
     932        case CSSPropertyWebkitPerspectiveOriginY:
     933            shorthandPropertyID = CSSPropertyWebkitPerspectiveOrigin;
     934            break;
     935        case CSSPropertyWebkitTransformOriginX:
     936        case CSSPropertyWebkitTransformOriginY:
     937        case CSSPropertyWebkitTransformOriginZ:
     938            shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
    939939            break;
    940940        case CSSPropertyWebkitTransitionProperty:

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

    r181824 r181825  
    5858
    5959    RefPtr<MutableStyleProperties> styleDeclaration = MutableStyleProperties::create();
    60     if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyTransform, string, true, CSSStrictMode, 0)) {
     60    if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform, string, true, CSSStrictMode, 0)) {
    6161        // Convert to TransformOperations. This can fail if a property
    6262        // requires style (i.e., param uses 'ems' or 'exs')
    63         RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSPropertyTransform);
     63        RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSPropertyWebkitTransform);
    6464
    6565        // Check for a "none" or empty transform. In these cases we can use the default identity matrix.

  • trunk/Source/WebCore/html/track/VTTCue.cpp

    r181824 r181825  
    222222        // maintaining the relative positions of the boxes in boxes to each
    223223        // other.
    224         setInlineStyleProperty(CSSPropertyTransform,
     224        setInlineStyleProperty(CSSPropertyWebkitTransform,
    225225            String::format("translate(-%.2f%%, -%.2f%%)", position.first, position.second));
    226226

  • trunk/Source/WebCore/page/animation/AnimationController.cpp

    r181824 r181825  
    426426
    427427    const CompositeAnimation& rendererAnimations = *m_compositeAnimations.get(&renderer);
    428     if (!rendererAnimations.isAnimatingProperty(CSSPropertyTransform, false, AnimationBase::Running | AnimationBase::Paused))
     428    if (!rendererAnimations.isAnimatingProperty(CSSPropertyWebkitTransform, false, AnimationBase::Running | AnimationBase::Paused))
    429429        return true;
    430430

  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r181824 r181825  
    578578public:
    579579    PropertyWrapperAcceleratedTransform()
    580         : PropertyWrapper<const TransformOperations&>(CSSPropertyTransform, &RenderStyle::transform, &RenderStyle::setTransform)
     580        : PropertyWrapper<const TransformOperations&>(CSSPropertyWebkitTransform, &RenderStyle::transform, &RenderStyle::setTransform)
    581581    {
    582582    }
    … …  
    12381238        new LengthPropertyWrapper<Length>(CSSPropertyTextIndent, &RenderStyle::textIndent, &RenderStyle::setTextIndent),
    12391239
    1240         new PropertyWrapper<float>(CSSPropertyPerspective, &RenderStyle::perspective, &RenderStyle::setPerspective),
    1241         new LengthPropertyWrapper<Length>(CSSPropertyPerspectiveOriginX, &RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX),
    1242         new LengthPropertyWrapper<Length>(CSSPropertyPerspectiveOriginY, &RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY),
    1243         new LengthPropertyWrapper<Length>(CSSPropertyTransformOriginX, &RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX),
    1244         new LengthPropertyWrapper<Length>(CSSPropertyTransformOriginY, &RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY),
    1245         new PropertyWrapper<float>(CSSPropertyTransformOriginZ, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ),
     1240        new PropertyWrapper<float>(CSSPropertyWebkitPerspective, &RenderStyle::perspective, &RenderStyle::setPerspective),
     1241        new LengthPropertyWrapper<Length>(CSSPropertyWebkitPerspectiveOriginX, &RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX),
     1242        new LengthPropertyWrapper<Length>(CSSPropertyWebkitPerspectiveOriginY, &RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY),
     1243        new LengthPropertyWrapper<Length>(CSSPropertyWebkitTransformOriginX, &RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX),
     1244        new LengthPropertyWrapper<Length>(CSSPropertyWebkitTransformOriginY, &RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY),
     1245        new PropertyWrapper<float>(CSSPropertyWebkitTransformOriginZ, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ),
    12461246        new LengthPropertyWrapper<LengthSize>(CSSPropertyBorderTopLeftRadius, &RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius),
    12471247        new LengthPropertyWrapper<LengthSize>(CSSPropertyBorderTopRightRadius, &RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius),
    … …  
    13281328        CSSPropertyColumnRule,
    13291329        CSSPropertyWebkitBorderRadius,
    1330         CSSPropertyTransformOrigin
     1330        CSSPropertyWebkitTransformOrigin
    13311331    };
    13321332    const unsigned animatableShorthandPropertiesCount = WTF_ARRAY_LENGTH(animatableShorthandProperties);

  • trunk/Source/WebCore/page/animation/CompositeAnimation.cpp

    r181824 r181825  
    425425    for (auto& it : m_keyframeAnimations) {
    426426        if (KeyframeAnimation* anim = it.value.get()) {
    427             if (!anim->hasAnimationForProperty(CSSPropertyTransform))
     427            if (!anim->hasAnimationForProperty(CSSPropertyWebkitTransform))
    428428                continue;
    429429
    … …  
    440440    for (auto& it : m_transitions) {
    441441        if (ImplicitAnimation* anim = it.value.get()) {
    442             if (anim->animatingProperty() != CSSPropertyTransform || !anim->hasStyle())
     442            if (anim->animatingProperty() != CSSPropertyWebkitTransform || !anim->hasStyle())
    443443                continue;
    444444

  • trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp

    r181824 r181825  
    108108        return true; // Non-boxes don't get transformed;
    109109
    110     ASSERT(m_animatingProperty == CSSPropertyTransform);
     110    ASSERT(m_animatingProperty == CSSPropertyWebkitTransform);
    111111
    112112    RenderBox& box = downcast<RenderBox>(*m_object);

  • trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp

    r181824 r181825  
    202202bool KeyframeAnimation::computeExtentOfTransformAnimation(LayoutRect& bounds) const
    203203{
    204     ASSERT(m_keyframes.containsProperty(CSSPropertyTransform));
     204    ASSERT(m_keyframes.containsProperty(CSSPropertyWebkitTransform));
    205205
    206206    if (!is<RenderBox>(m_object))
    … …  
    216216        const KeyframeValue& currKeyFrame = m_keyframes[i];
    217217
    218         if (!currKeyFrame.containsProperty(CSSPropertyTransform))
     218        if (!currKeyFrame.containsProperty(CSSPropertyWebkitTransform))
    219219            continue;
    220220
    … …  
    360360    m_transformFunctionListValid = false;
    361361   
    362     if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyTransform))
     362    if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitTransform))
    363363        return;
    364364

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

    r181824 r181825  
    552552int GraphicsLayer::validateTransformOperations(const KeyframeValueList& valueList, bool& hasBigRotation)
    553553{
    554     ASSERT(valueList.property() == AnimatedPropertyTransform);
     554    ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
    555555
    556556    hasBigRotation = false;

  • trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h

    r181824 r181825  
    5353enum AnimatedPropertyID {
    5454    AnimatedPropertyInvalid,
    55     AnimatedPropertyTransform,
     55    AnimatedPropertyWebkitTransform,
    5656    AnimatedPropertyOpacity,
    5757    AnimatedPropertyBackgroundColor,

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r181824 r181825  
    233233{
    234234    switch (property) {
    235     case AnimatedPropertyTransform:
     235    case AnimatedPropertyWebkitTransform:
    236236        return "transform";
    237237    case AnimatedPropertyOpacity:
    … …  
    610610            const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
    611611
    612             if (currAnimation.m_property == AnimatedPropertyTransform
    613                 || currAnimation.m_property == AnimatedPropertyOpacity
    614                 || currAnimation.m_property == AnimatedPropertyBackgroundColor
    615                 || currAnimation.m_property == AnimatedPropertyWebkitFilter)
     612            if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
     613                    || currAnimation.m_property == AnimatedPropertyBackgroundColor
     614                    || currAnimation.m_property == AnimatedPropertyWebkitFilter
     615                )
    616616                moveOrCopyLayerAnimation(operation, animationIdentifier(currAnimation.m_name, currAnimation.m_property, currAnimation.m_index, currAnimation.m_subIndex), fromLayer, toLayer);
    617617        }
    … …  
    885885
    886886    bool createdAnimations = false;
    887     if (valueList.property() == AnimatedPropertyTransform)
     887    if (valueList.property() == AnimatedPropertyWebkitTransform)
    888888        createdAnimations = createTransformAnimationsFromKeyframes(valueList, anim, animationName, timeOffset, boxSize);
    889889    else if (valueList.property() == AnimatedPropertyWebkitFilter) {
    … …  
    24082408        for (size_t i = 0; i < numAnimations; ++i) {
    24092409            const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
    2410             if (currAnimation.m_property == AnimatedPropertyTransform)
     2410            if (currAnimation.m_property == AnimatedPropertyWebkitTransform)
    24112411                return true;
    24122412        }
    … …  
    25322532bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset)
    25332533{
    2534     ASSERT(valueList.property() != AnimatedPropertyTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
     2534    ASSERT(valueList.property() != AnimatedPropertyWebkitTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
    25352535
    25362536    bool isKeyframe = valueList.size() > 2;
    … …  
    25832583bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset, const FloatSize& boxSize)
    25842584{
    2585     ASSERT(valueList.property() == AnimatedPropertyTransform);
     2585    ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
    25862586
    25872587    bool hasBigRotation;

  • trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

    r181824 r181825  
    562562    ASSERT(!keyframesName.isEmpty());
    563563
    564     if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity))
     564    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity))
    565565        return false;
    566566
    … …  
    568568    bool hasBigRotation;
    569569
    570     if (valueList.property() == AnimatedPropertyTransform)
     570    if (valueList.property() == AnimatedPropertyWebkitTransform)
    571571        listsMatch = validateTransformOperations(valueList, hasBigRotation) >= 0;
    572572

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp

    r181824 r181825  
    230230        client->setAnimatedOpacity(applyOpacityAnimation((static_cast<const FloatAnimationValue&>(from).value()), (static_cast<const FloatAnimationValue&>(to).value()), progress));
    231231        return;
    232     case AnimatedPropertyTransform:
     232    case AnimatedPropertyWebkitTransform:
    233233        client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue&>(from).value(), static_cast<const TransformAnimationValue&>(to).value(), progress, m_boxSize, m_listsMatch));
    234234        return;

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

    r181824 r181825  
    657657{
    658658    m_animations.apply(this);
    659     if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
     659    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
    660660        m_currentTransform.setLocalTransform(m_state.transform);
    661661    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

    r181824 r181825  
    11541154bool CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation() const
    11551155{
    1156     if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
     1156    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
    11571157        return true;
    11581158
    … …  
    11651165bool CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms()
    11661166{
    1167     if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
     1167    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
    11681168        return true;
    11691169
    … …  
    11811181    ASSERT(!keyframesName.isEmpty());
    11821182
    1183     if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyWebkitFilter))
     1183    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyWebkitFilter))
    11841184        return false;
    11851185
    … …  
    11871187    bool ignoredHasBigRotation;
    11881188
    1189     if (valueList.property() == AnimatedPropertyTransform)
     1189    if (valueList.property() == AnimatedPropertyWebkitTransform)
    11901190        listsMatch = validateTransformOperations(valueList, ignoredHasBigRotation) >= 0;
    11911191

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r181824 r181825  
    675675    // Set transform property, if it is not animating. We have to do this here because the transform
    676676    // is affected by the layer dimensions.
    677     if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
     677    if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
    678678        updateTransform(style);
    679679
    … …  
    24442444{
    24452445    bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
    2446     bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyTransform);
     2446    bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
    24472447    bool hasFilter = keyframes.containsProperty(CSSPropertyWebkitFilter);
    24482448
    … …  
    24502450        return false;
    24512451   
    2452     KeyframeValueList transformVector(AnimatedPropertyTransform);
     2452    KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
    24532453    KeyframeValueList opacityVector(AnimatedPropertyOpacity);
    24542454    KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
    … …  
    24662466       
    24672467        bool isFirstOrLastKeyframe = key == 0 || key == 1;
    2468         if ((hasTransform && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyTransform))
     2468        if ((hasTransform && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitTransform))
    24692469            transformVector.insert(std::make_unique<TransformAnimationValue>(key, keyframeStyle->transform(), tf));
    24702470
    … …  
    25242524    }
    25252525
    2526     if (property == CSSPropertyTransform && m_owningLayer.hasTransform()) {
    2527         const Animation* transformAnim = toStyle->transitionForProperty(CSSPropertyTransform);
     2526    if (property == CSSPropertyWebkitTransform && m_owningLayer.hasTransform()) {
     2527        const Animation* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
    25282528        if (transformAnim && !transformAnim->isEmptyOrZeroDuration()) {
    2529             KeyframeValueList transformVector(AnimatedPropertyTransform);
     2529            KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
    25302530            transformVector.insert(std::make_unique<TransformAnimationValue>(0, fromStyle->transform()));
    25312531            transformVector.insert(std::make_unique<TransformAnimationValue>(1, toStyle->transform()));
    2532             if (m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyTransform), timeOffset)) {
     2532            if (m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
    25332533                // To ensure that the correct transform is visible when the animation ends, also set the final transform.
    25342534                updateTransform(*toStyle);
    … …  
    26272627    CSSPropertyID cssProperty = CSSPropertyInvalid;
    26282628    switch (property) {
    2629     case AnimatedPropertyTransform:
    2630         cssProperty = CSSPropertyTransform;
    2631         break;
    2632     case AnimatedPropertyOpacity:
    2633         cssProperty = CSSPropertyOpacity;
    2634         break;
    2635     case AnimatedPropertyBackgroundColor:
    2636         cssProperty = CSSPropertyBackgroundColor;
    2637         break;
    2638     case AnimatedPropertyWebkitFilter:
    2639         cssProperty = CSSPropertyWebkitFilter;
    2640         break;
    2641     case AnimatedPropertyInvalid:
    2642         ASSERT_NOT_REACHED();
     2629        case AnimatedPropertyWebkitTransform:
     2630            cssProperty = CSSPropertyWebkitTransform;
     2631            break;
     2632        case AnimatedPropertyOpacity:
     2633            cssProperty = CSSPropertyOpacity;
     2634            break;
     2635        case AnimatedPropertyBackgroundColor:
     2636            cssProperty = CSSPropertyBackgroundColor;
     2637            break;
     2638        case AnimatedPropertyWebkitFilter:
     2639            cssProperty = CSSPropertyWebkitFilter;
     2640            break;
     2641        case AnimatedPropertyInvalid:
     2642            ASSERT_NOT_REACHED();
    26432643    }
    26442644    return cssProperty;
    … …  
    26482648{
    26492649    switch (cssProperty) {
    2650     case CSSPropertyTransform:
    2651         return AnimatedPropertyTransform;
    2652     case CSSPropertyOpacity:
    2653         return AnimatedPropertyOpacity;
    2654     case CSSPropertyBackgroundColor:
    2655         return AnimatedPropertyBackgroundColor;
    2656     case CSSPropertyWebkitFilter:
    2657         return AnimatedPropertyWebkitFilter;
    2658     default:
    2659         // It's fine if we see other css properties here; they are just not accelerated.
    2660         break;
     2650        case CSSPropertyWebkitTransform:
     2651            return AnimatedPropertyWebkitTransform;
     2652        case CSSPropertyOpacity:
     2653            return AnimatedPropertyOpacity;
     2654        case CSSPropertyBackgroundColor:
     2655            return AnimatedPropertyBackgroundColor;
     2656        case CSSPropertyWebkitFilter:
     2657            return AnimatedPropertyWebkitFilter;
     2658        default:
     2659            // It's fine if we see other css properties here; they are just not accelerated.
     2660            break;
    26612661    }
    26622662    return AnimatedPropertyInvalid;

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r181824 r181825  
    26132613            && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
    26142614            || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitFilter, activeAnimationState)
    2615             || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyTransform, activeAnimationState);
     2615            || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, activeAnimationState);
    26162616}
    26172617
    … …  
    28112811        return false;
    28122812
    2813     return renderer.animation().isRunningAnimationOnRenderer(renderer, CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused);
     2813    return renderer.animation().isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused);
    28142814}
    28152815

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r181824 r181825  
    159159    // FIXME: When CSS supports "transform-origin" this special case can be removed,
    160160    // and we can add transform_originAttr to the table above instead.
    161     map.add(transform_originAttr.localName().impl(), CSSPropertyTransformOrigin);
     161    map.add(transform_originAttr.localName().impl(), CSSPropertyWebkitTransformOrigin);
    162162}
    163163

  • trunk/Source/WebKit2/ChangeLog

    r181824 r181825  
     12015-03-21  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r181824.
     4        https://bugs.webkit.org/show_bug.cgi?id=142935
     5
     6        Broke Windows build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Remove the prefix for CSS Transforms"
     11        https://bugs.webkit.org/show_bug.cgi?id=142927
     12        http://trac.webkit.org/changeset/181824
     13
    1142015-03-20  Dean Jackson  <dino@apple.com>
    215

  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp

    r181824 r181825  
    446446            encoder << static_cast<const FloatAnimationValue&>(value).value();
    447447            break;
    448         case AnimatedPropertyTransform:
     448        case AnimatedPropertyWebkitTransform:
    449449            encoder << static_cast<const TransformAnimationValue&>(value).value();
    450450            break;
    … …  
    528528            break;
    529529        }
    530         case AnimatedPropertyTransform: {
     530        case AnimatedPropertyWebkitTransform: {
    531531            TransformOperations transform;
    532532            if (!decoder.decode(transform))
Note: See TracChangeset for help on using the changeset viewer.