Changeset 181832 in webkit

Timestamp:

Mar 21, 2015, 9:55:33 PM (11 years ago)

Author:

dino@apple.com

Message:

Remove the prefix for CSS Transforms
​https://bugs.webkit.org/show_bug.cgi?id=142927
<rdar://problem/11568151>

Reviewed by Simon Fraser.

Source/WebCore:

Support the bare form of:

• transform
• transform-style
• transform-origin
• perspective
• perspective-origin

For transform-style, we also still differentiate the prefixed property
because we may want to use that as an indicator of legacy content.

This is mostly a find and replace, but with some related naming
changes. The DOM interface for WebKitCSSTransformValue remains
unchanged.

Tests: transforms/2d/transform-2d-prefixed.html

transforms/3d/general/prefixed-3dtransform-values.html

• bindings/js/JSCSSStyleDeclarationCustom.cpp:

(WebCore::propertyChangeMayRepaintNonDescendants):

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):

• css/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::parseTranslateTransformValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseTransformOrigin):
(WebCore::CSSParser::parsePerspectiveOrigin):

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

(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::asText):

• css/WebKitCSSMatrix.cpp:

(WebCore::WebKitCSSMatrix::setMatrixValue):

• html/track/VTTCue.cpp:

(WebCore::VTTCueBox::applyCSSProperties):

• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::computeExtentOfAnimation):

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::PropertyWrapperAcceleratedTransform::PropertyWrapperAcceleratedTransform):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• page/animation/CompositeAnimation.cpp:

(WebCore::CompositeAnimation::computeExtentOfTransformAnimation):

• page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
(WebCore::KeyframeAnimation::validateTransformFunctionList):

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::validateTransformOperations):

• platform/graphics/GraphicsLayerClient.h:
• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::propertyIdToString):
(WebCore::GraphicsLayerCA::moveOrCopyAnimations):
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::isRunningTransformAnimation):
(WebCore::GraphicsLayerCA::createAnimationFromKeyframes):
(WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes):

• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

(WebCore::GraphicsLayerTextureMapper::addAnimation):

• platform/graphics/texmap/TextureMapperAnimation.cpp:

(WebCore::TextureMapperAnimation::applyInternal):

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::syncAnimations):

• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation):
(WebCore::CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms):
(WebCore::CoordinatedGraphicsLayer::addAnimation):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::startAnimation):
(WebCore::RenderLayerBacking::startTransition):
(WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
(WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
(WebCore::RenderLayerCompositor::isRunningTransformAnimation):

• svg/SVGElement.cpp:

(WebCore::populateAttributeNameToCSSPropertyIDMap):

Source/WebKit2:

Rename AnimatedPropertyWebkitTransform to AnimatedPropertyTransform.

• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:

(IPC::ArgumentCoder<TextureMapperAnimation>::encode):

LayoutTests:

Convert the helper functions for transforms to use the unprefixed
form, and copy some tests to make sure the prefixed form still works.

• fast/css/getComputedStyle/computed-style-expected.txt:
• fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• fast/css/getComputedStyle/resources/property-names.js:
• svg/css/getComputedStyle-basic-expected.txt:
• transforms/2d/computed-style-origin-expected.txt:
• transforms/2d/computed-style-origin.html:
• transforms/2d/resources/prefixed-transform-test-utils.js: Copied from LayoutTests/transforms/2d/resources/transform-test-utils.js.

(floatingPointEqual):
(compareMatrices):
(testTransforms):

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

(testTransforms):

• transforms/2d/transform-2d-prefixed-expected.txt: Added.
• transforms/2d/transform-2d-prefixed.html: Added.
• transforms/3d/general/prefixed-3dtransform-values-expected.txt: Added.
• transforms/3d/general/prefixed-3dtransform-values.html: Added.
• transitions/transition-end-event-multiple-04-expected.txt:
• transitions/transition-end-event-multiple-04.html:
• transitions/transition-end-event-transform-expected.txt:
• transitions/transition-end-event-transform.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (modified) (3 diffs)
• LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (modified) (3 diffs)
• LayoutTests/fast/css/getComputedStyle/resources/property-names.js (modified) (2 diffs)
• LayoutTests/svg/css/getComputedStyle-basic-expected.txt (modified) (6 diffs)
• LayoutTests/transforms/2d/computed-style-origin-expected.txt (modified) (1 diff)
• LayoutTests/transforms/2d/computed-style-origin.html (modified) (7 diffs)
• LayoutTests/transforms/2d/resources/prefixed-transform-test-utils.js (copied) (copied from trunk/LayoutTests/transforms/2d/resources/transform-test-utils.js ) (1 diff)
• LayoutTests/transforms/2d/resources/transform-test-utils.js (modified) (1 diff)
• LayoutTests/transforms/2d/transform-2d-prefixed-expected.txt (added)
• LayoutTests/transforms/2d/transform-2d-prefixed.html (added)
• LayoutTests/transforms/3d/general/prefixed-3dtransform-values-expected.txt (added)
• LayoutTests/transforms/3d/general/prefixed-3dtransform-values.html (added)
• LayoutTests/transitions/transition-end-event-multiple-04-expected.txt (modified) (1 diff)
• LayoutTests/transitions/transition-end-event-multiple-04.html (modified) (2 diffs)
• LayoutTests/transitions/transition-end-event-transform-expected.txt (modified) (1 diff)
• LayoutTests/transitions/transition-end-event-transform.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (8 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (11 diffs)
• Source/WebCore/css/CSSPropertyNames.in (modified) (2 diffs)
• Source/WebCore/css/StyleProperties.cpp (modified) (2 diffs)
• Source/WebCore/css/WebKitCSSMatrix.cpp (modified) (1 diff)
• Source/WebCore/html/track/VTTCue.cpp (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (1 diff)
• Source/WebCore/page/animation/CSSPropertyAnimation.cpp (modified) (3 diffs)
• Source/WebCore/page/animation/CompositeAnimation.cpp (modified) (2 diffs)
• Source/WebCore/page/animation/ImplicitAnimation.cpp (modified) (1 diff)
• Source/WebCore/page/animation/KeyframeAnimation.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayerClient.h (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (6 diffs)
• Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (7 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGElement.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-21  Dean Jackson  <dino@apple.com>
+
+        Remove the prefix for CSS Transforms
+        https://bugs.webkit.org/show_bug.cgi?id=142927
+        <rdar://problem/11568151>
+
+        Reviewed by Simon Fraser.
+
+        Convert the helper functions for transforms to use the unprefixed
+        form, and copy some tests to make sure the prefixed form still works.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * fast/css/getComputedStyle/resources/property-names.js:
+        * svg/css/getComputedStyle-basic-expected.txt:
+        * transforms/2d/computed-style-origin-expected.txt:
+        * transforms/2d/computed-style-origin.html:
+        * transforms/2d/resources/prefixed-transform-test-utils.js: Copied from LayoutTests/transforms/2d/resources/transform-test-utils.js.
+        (floatingPointEqual):
+        (compareMatrices):
+        (testTransforms):
+        * transforms/2d/resources/transform-test-utils.js:
+        (testTransforms):
+        * transforms/2d/transform-2d-prefixed-expected.txt: Added.
+        * transforms/2d/transform-2d-prefixed.html: Added.
+        * transforms/3d/general/prefixed-3dtransform-values-expected.txt: Added.
+        * transforms/3d/general/prefixed-3dtransform-values.html: Added.
+        * transitions/transition-end-event-multiple-04-expected.txt:
+        * transitions/transition-end-event-multiple-04.html:
+        * transitions/transition-end-event-transform-expected.txt:
+        * transitions/transition-end-event-transform.html:
+
 2015-03-21  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -92 +92 @@
 text-transform: none;
 top: auto;
+transform: none;
+transform-origin: 392px 288px;
+transform-style: flat;
 unicode-bidi: normal;
 vertical-align: baseline;
@@ -195 +198 @@
 -webkit-nbsp-mode: normal;
 order: 0;
--webkit-perspective: none;
--webkit-perspective-origin: 392px 288px;
+perspective: none;
+perspective-origin: 392px 288px;
 -webkit-print-color-adjust: economy;
 -webkit-rtl-ordering: logical;
@@ -209 +212 @@
 -webkit-text-stroke-color: rgb(0, 0, 0);
 -webkit-text-stroke-width: 0px;
--webkit-transform: none;
--webkit-transform-origin: 392px 288px;
 -webkit-transform-style: flat;
 -webkit-transition-delay: 0s;

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

@@ -91 +91 @@
 text-transform: none
 top: auto
+transform: none
+transform-origin: 50% 50%
+transform-style: flat
 unicode-bidi: normal
 vertical-align: baseline
@@ -194 +197 @@
 -webkit-nbsp-mode: normal
 order: 0
--webkit-perspective: none
--webkit-perspective-origin: 50% 50%
+perspective: none
+perspective-origin: 50% 50%
 -webkit-print-color-adjust: economy
 -webkit-rtl-ordering: logical
@@ -208 +211 @@
 -webkit-text-stroke-color: rgb(0, 0, 0)
 -webkit-text-stroke-width: 0px
--webkit-transform: none
--webkit-transform-origin: 50% 50%
 -webkit-transform-style: flat
 -webkit-transition-delay: 0s

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

@@ -95 +95 @@
     "-webkit-nbsp-mode": true,
     "order": true,
-    "-webkit-perspective": true,
-    "-webkit-perspective-origin": true,
+    "perspective": true,
+    "perspective-origin": true,
     "-webkit-print-color-adjust": true,
     "-webkit-rtl-ordering": true,
@@ -110 +110 @@
     "-webkit-text-stroke-color": true,
     "-webkit-text-stroke-width": true,
-    "-webkit-transform": true,
-    "-webkit-transform-origin": true,
+    "transform": true,
+    "transform-origin": true,
+    "transform-style": true,
     "-webkit-transform-style": true,
     "-webkit-transition-delay": true,

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

@@ -181 +181 @@
 rect: style.getPropertyValue(top) : auto
 rect: style.getPropertyCSSValue(top) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(transform) : none
+rect: style.getPropertyCSSValue(transform) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(transform-origin) : 0px 0px
+rect: style.getPropertyCSSValue(transform-origin) : [object CSSValueList]
+rect: style.getPropertyValue(transform-style) : flat
+rect: style.getPropertyCSSValue(transform-style) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(unicode-bidi) : normal
 rect: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
@@ -387 +393 @@
 rect: style.getPropertyValue(order) : 0
 rect: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-perspective) : none
-rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
-rect: style.getPropertyCSSValue(-webkit-perspective-origin) : [object CSSValueList]
+rect: style.getPropertyValue(perspective) : none
+rect: style.getPropertyCSSValue(perspective) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(perspective-origin) : 0px 0px
+rect: style.getPropertyCSSValue(perspective-origin) : [object CSSValueList]
 rect: style.getPropertyValue(-webkit-print-color-adjust) : economy
 rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
@@ -415 +421 @@
 rect: style.getPropertyValue(-webkit-text-stroke-width) : 0px
 rect: style.getPropertyCSSValue(-webkit-text-stroke-width) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-transform) : none
-rect: style.getPropertyCSSValue(-webkit-transform) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-transform-origin) : 0px 0px
-rect: style.getPropertyCSSValue(-webkit-transform-origin) : [object CSSValueList]
 rect: style.getPropertyValue(-webkit-transform-style) : flat
 rect: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]
@@ -693 +695 @@
 g: style.getPropertyValue(top) : auto
 g: style.getPropertyCSSValue(top) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(transform) : none
+g: style.getPropertyCSSValue(transform) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(transform-origin) : 0px 0px
+g: style.getPropertyCSSValue(transform-origin) : [object CSSValueList]
+g: style.getPropertyValue(transform-style) : flat
+g: style.getPropertyCSSValue(transform-style) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(unicode-bidi) : normal
 g: style.getPropertyCSSValue(unicode-bidi) : [object CSSPrimitiveValue]
@@ -899 +907 @@
 g: style.getPropertyValue(order) : 0
 g: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-perspective) : none
-g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
-g: style.getPropertyCSSValue(-webkit-perspective-origin) : [object CSSValueList]
+g: style.getPropertyValue(perspective) : none
+g: style.getPropertyCSSValue(perspective) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(perspective-origin) : 0px 0px
+g: style.getPropertyCSSValue(perspective-origin) : [object CSSValueList]
 g: style.getPropertyValue(-webkit-print-color-adjust) : economy
 g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
@@ -927 +935 @@
 g: style.getPropertyValue(-webkit-text-stroke-width) : 0px
 g: style.getPropertyCSSValue(-webkit-text-stroke-width) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-transform) : none
-g: style.getPropertyCSSValue(-webkit-transform) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-transform-origin) : 0px 0px
-g: style.getPropertyCSSValue(-webkit-transform-origin) : [object CSSValueList]
 g: style.getPropertyValue(-webkit-transform-style) : flat
 g: style.getPropertyCSSValue(-webkit-transform-style) : [object CSSPrimitiveValue]

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

@@ -4 +4 @@
 
 
-PASS test1Style.webkitTransformOrigin is '10px 10px'
-PASS test2Style.webkitTransformOrigin is '10px 10px'
-PASS test3Style.webkitTransformOrigin is '0px 20px'
-PASS test4Style.webkitTransformOrigin is '5px 7px'
-PASS test5Style.webkitTransformOrigin is '15px 15px'
-PASS test1Style.webkitPerspectiveOrigin is '10px 10px'
-PASS test2Style.webkitPerspectiveOrigin is '10px 10px'
-PASS test3Style.webkitPerspectiveOrigin is '0px 20px'
-PASS test4Style.webkitPerspectiveOrigin is '5px 7px'
-PASS test5Style.webkitPerspectiveOrigin is '15px 15px'
-PASS test6Style.webkitPerspectiveOrigin is '50px 50px'
+PASS test1Style.transformOrigin is '10px 10px'
+PASS test2Style.transformOrigin is '10px 10px'
+PASS test3Style.transformOrigin is '0px 20px'
+PASS test4Style.transformOrigin is '5px 7px'
+PASS test5Style.transformOrigin is '15px 15px'
+PASS test1Style.perspectiveOrigin is '10px 10px'
+PASS test2Style.perspectiveOrigin is '10px 10px'
+PASS test3Style.perspectiveOrigin is '0px 20px'
+PASS test4Style.perspectiveOrigin is '5px 7px'
+PASS test5Style.perspectiveOrigin is '15px 15px'
+PASS test6Style.perspectiveOrigin is '50px 50px'
 
 PASS successfullyParsed is true

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

@@ -7 +7 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
+        transform: translate(0);
         // default transform and perspective origin
     }
@@ -15 +15 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
-        -webkit-transform-origin: 50% 50%;
-        -webkit-perspective-origin: 50% 50%;
+        transform: translate(0);
+        transform-origin: 50% 50%;
+        perspective-origin: 50% 50%;
     }
     #test3 {
@@ -24 +24 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
-        -webkit-transform-origin: 0% 100%;
-        -webkit-perspective-origin: 0% 100%;
+        transform: translate(0);
+        transform-origin: 0% 100%;
+        perspective-origin: 0% 100%;
     }
     #test4 {
@@ -33 +33 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
-        -webkit-transform-origin: 5px 7px;
-        -webkit-perspective-origin: 5px 7px;
+        transform: translate(0);
+        transform-origin: 5px 7px;
+        perspective-origin: 5px 7px;
     }
     #test5 {
@@ -45 +45 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
-        -webkit-transform-origin: 50% 50%;
-        -webkit-perspective-origin: 50% 50%;
+        transform: translate(0);
+        transform-origin: 50% 50%;
+        perspective-origin: 50% 50%;
     }
     #test6 {
@@ -54 +54 @@
         background-color: blue;
         position: relative;
-        -webkit-transform: translate(0);
-        -webkit-perspective-origin: 10% 20% 30%;
+        transform: translate(0);
+        perspective-origin: 10% 20% 30%;
     }
 
@@ -88 +88 @@
 var test6Style = window.getComputedStyle(test6);
 
-shouldBe("test1Style.webkitTransformOrigin", "'10px 10px'");
-shouldBe("test2Style.webkitTransformOrigin", "'10px 10px'");
-shouldBe("test3Style.webkitTransformOrigin", "'0px 20px'");
-shouldBe("test4Style.webkitTransformOrigin", "'5px 7px'");
-shouldBe("test5Style.webkitTransformOrigin", "'15px 15px'");
+shouldBe("test1Style.transformOrigin", "'10px 10px'");
+shouldBe("test2Style.transformOrigin", "'10px 10px'");
+shouldBe("test3Style.transformOrigin", "'0px 20px'");
+shouldBe("test4Style.transformOrigin", "'5px 7px'");
+shouldBe("test5Style.transformOrigin", "'15px 15px'");
 
-shouldBe("test1Style.webkitPerspectiveOrigin", "'10px 10px'");
-shouldBe("test2Style.webkitPerspectiveOrigin", "'10px 10px'");
-shouldBe("test3Style.webkitPerspectiveOrigin", "'0px 20px'");
-shouldBe("test4Style.webkitPerspectiveOrigin", "'5px 7px'");
-shouldBe("test5Style.webkitPerspectiveOrigin", "'15px 15px'");
-shouldBe("test6Style.webkitPerspectiveOrigin", "'50px 50px'");
+shouldBe("test1Style.perspectiveOrigin", "'10px 10px'");
+shouldBe("test2Style.perspectiveOrigin", "'10px 10px'");
+shouldBe("test3Style.perspectiveOrigin", "'0px 20px'");
+shouldBe("test4Style.perspectiveOrigin", "'5px 7px'");
+shouldBe("test5Style.perspectiveOrigin", "'15px 15px'");
+shouldBe("test6Style.perspectiveOrigin", "'50px 50px'");
 
 debug("");

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

@@ -42 +42 @@
   var testBox = document.getElementById('test-box');
   var resultsBox = document.getElementById('results');
-  
+
   gTests.forEach(function(curTest) {
     testBox.style.webkitTransform = 'none'; // reset the transform just in case the next step fails

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

@@ -42 +42 @@
   var testBox = document.getElementById('test-box');
   var resultsBox = document.getElementById('results');
-  
+
   gTests.forEach(function(curTest) {
-    testBox.style.webkitTransform = 'none'; // reset the transform just in case the next step fails
-    testBox.style.webkitTransform = curTest.transform;
-    var computedTransform = window.getComputedStyle(testBox).webkitTransform;
+    testBox.style.transform = 'none'; // reset the transform just in case the next step fails
+    testBox.style.transform = curTest.transform;
+    var computedTransform = window.getComputedStyle(testBox).transform;
 
     var success = compareMatrices(computedTransform, curTest.result);

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

@@ -1 +1 @@
 Initiating transitions on transform properties of all boxes, starting at different times and with different durations and values.
 
-PASS --- [Expected] Property: -webkit-transform Target: box1 Elapsed Time: 0.5
-PASS --- [Expected] Property: -webkit-transform Target: box2 Elapsed Time: 0.55
-PASS --- [Expected] Property: -webkit-transform Target: box4 Elapsed Time: 0.4
+PASS --- [Expected] Property: transform Target: box1 Elapsed Time: 0.5
+PASS --- [Expected] Property: transform Target: box2 Elapsed Time: 0.55
+PASS --- [Expected] Property: transform Target: box4 Elapsed Time: 0.4
 

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

@@ -9 +9 @@
       margin: 10px;
       background-color: blue;
-      -webkit-transform: translate(0);
-      -webkit-transition-property: -webkit-transform;
-      -webkit-transition-duration: 0.5s;
+      transform: translate(0);
+      transition-property: transform;
+      transition-duration: 0.5s;
     }
     
     .box1 {
-      -webkit-transform: translate(50px);
+      transform: translate(50px);
     }
     
     .box2 {
-      -webkit-transform: translate(50px) scale(1.05);
-      -webkit-transition-duration: 0.55s;
+      transform: translate(50px) scale(1.05);
+      transition-duration: 0.55s;
     }
     
     .box3 {
-      -webkit-transform: translate(0); /* same as default */
-      -webkit-transition-duration: 0.3s;
+      transform: translate(0); /* same as default */
+      transition-duration: 0.3s;
     }
 
     .box4 {
-      -webkit-transform: translate(100px);
-      -webkit-transition-duration: 0.4s;
+      transform: translate(100px);
+      transition-duration: 0.4s;
     }
 
@@ -43 +43 @@
     var expectedEndEvents = [
       // [property-name, element-id, elapsed-time, listen]
-      ["-webkit-transform", "box1", 0.5, false],
-      ["-webkit-transform", "box2", 0.55, false],
-      ["-webkit-transform", "box4", 0.4, false]
+      ["transform", "box1", 0.5, false],
+      ["transform", "box2", 0.55, false],
+      ["transform", "box4", 0.4, false]
     ];
   

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

@@ -1 +1 @@
 Initiating a 500ms transition on the transform property of box1.
 
-PASS --- [Expected] Property: -webkit-transform Target: box1 Elapsed Time: 0.5
+PASS --- [Expected] Property: transform Target: box1 Elapsed Time: 0.5
 

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

@@ -9 +9 @@
       margin: 10px;
       background-color: blue;
-      -webkit-transition-property: -webkit-transform;
-      -webkit-transition-duration: 0.5s;
-      -webkit-transform: translate(100px);
+      transition-property: ransform;
+      transition-duration: 0.5s;
+      transform: translate(100px);
     }
   </style>
@@ -19 +19 @@
     var expectedEndEvents = [
       // [property-name, element-id, elapsed-time, listen]
-      ["-webkit-transform", "box1", 0.5, true]
+      ["transform", "box1", 0.5, true]
     ];
     
@@ -25 +25 @@
     {
       var box = document.getElementById('box1');
-      box.style.webkitTransform = 'translate(200px)';
+      box.style.transform = 'translate(200px)';
     }
     

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-21  Dean Jackson  <dino@apple.com>
+
+        Remove the prefix for CSS Transforms
+        https://bugs.webkit.org/show_bug.cgi?id=142927
+        <rdar://problem/11568151>
+
+        Reviewed by Simon Fraser.
+
+        Support the bare form of:
+        - transform
+        - transform-style
+        - transform-origin
+        - perspective
+        - perspective-origin
+
+        For transform-style, we also still differentiate the prefixed property
+        because we may want to use that as an indicator of legacy content.
+
+        This is mostly a find and replace, but with some related naming
+        changes. The DOM interface for WebKitCSSTransformValue remains
+        unchanged.
+
+        Tests: transforms/2d/transform-2d-prefixed.html
+               transforms/3d/general/prefixed-3dtransform-values.html
+
+        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+        (WebCore::propertyChangeMayRepaintNonDescendants):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::isLayoutDependent):
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSParser.cpp:
+        (WebCore::isValidKeywordPropertyAndValue):
+        (WebCore::isKeywordPropertyID):
+        (WebCore::parseTranslateTransformValue):
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseTransformOrigin):
+        (WebCore::CSSParser::parsePerspectiveOrigin):
+        * css/CSSPropertyNames.in:
+        * css/StyleProperties.cpp:
+        (WebCore::StyleProperties::getPropertyValue):
+        (WebCore::StyleProperties::asText):
+        * css/WebKitCSSMatrix.cpp:
+        (WebCore::WebKitCSSMatrix::setMatrixValue):
+        * html/track/VTTCue.cpp:
+        (WebCore::VTTCueBox::applyCSSProperties):
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::computeExtentOfAnimation):
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::PropertyWrapperAcceleratedTransform::PropertyWrapperAcceleratedTransform):
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimation::computeExtentOfTransformAnimation):
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
+        (WebCore::KeyframeAnimation::validateTransformFunctionList):
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::validateTransformOperations):
+        * platform/graphics/GraphicsLayerClient.h:
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::propertyIdToString):
+        (WebCore::GraphicsLayerCA::moveOrCopyAnimations):
+        (WebCore::GraphicsLayerCA::addAnimation):
+        (WebCore::GraphicsLayerCA::isRunningTransformAnimation):
+        (WebCore::GraphicsLayerCA::createAnimationFromKeyframes):
+        (WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes):
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::addAnimation):
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        (WebCore::TextureMapperAnimation::applyInternal):
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::syncAnimations):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation):
+        (WebCore::CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms):
+        (WebCore::CoordinatedGraphicsLayer::addAnimation):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGeometry):
+        (WebCore::RenderLayerBacking::startAnimation):
+        (WebCore::RenderLayerBacking::startTransition):
+        (WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
+        (WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+        (WebCore::RenderLayerCompositor::isRunningTransformAnimation):
+        * svg/SVGElement.cpp:
+        (WebCore::populateAttributeNameToCSSPropertyIDMap):
+
 2015-03-21  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -331 +331 @@
     case CSSPropertyRight:
     case CSSPropertyTop:
-    case CSSPropertyWebkitTransform:
+    case CSSPropertyTransform:
         return false;
     default:

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -216 +216 @@
     CSSPropertyTextTransform,
     CSSPropertyTop,
+    CSSPropertyTransform,
+    CSSPropertyTransformOrigin,
+    CSSPropertyTransformStyle,
     CSSPropertyTransitionDelay,
     CSSPropertyTransitionDuration,
@@ -363 +366 @@
     CSSPropertyWebkitOverflowScrolling,
 #endif
-    CSSPropertyWebkitPerspective,
-    CSSPropertyWebkitPerspectiveOrigin,
+    CSSPropertyPerspective,
+    CSSPropertyPerspectiveOrigin,
     CSSPropertyWebkitPrintColorAdjust,
     CSSPropertyWebkitRtlOrdering,
@@ -389 +392 @@
     CSSPropertyWebkitTextStrokeColor,
     CSSPropertyWebkitTextStrokeWidth,
-    CSSPropertyWebkitTransform,
-    CSSPropertyWebkitTransformOrigin,
     CSSPropertyWebkitTransformStyle,
     CSSPropertyWebkitTransitionDelay,
@@ -1638 +1639 @@
     case CSSPropertyWebkitGridTemplateRows:
 #endif
-    case CSSPropertyWebkitPerspectiveOrigin:
-    case CSSPropertyWebkitTransformOrigin:
-    case CSSPropertyWebkitTransform:
+    case CSSPropertyPerspectiveOrigin:
+    case CSSPropertyTransformOrigin:
+    case CSSPropertyTransform:
     case CSSPropertyWebkitFilter:
 #if ENABLE(FILTERS_LEVEL_2)
@@ -2819 +2820 @@
             return cssValuePool().createIdentifierValue(CSSValueTouch);
 #endif
-        case CSSPropertyWebkitPerspective:
+        case CSSPropertyPerspective:
             if (!style->hasPerspective())
                 return cssValuePool().createIdentifierValue(CSSValueNone);
             return zoomAdjustedPixelValue(style->perspective(), style.get());
-        case CSSPropertyWebkitPerspectiveOrigin: {
+        case CSSPropertyPerspectiveOrigin: {
             RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
             if (renderer) {
@@ -2874 +2875 @@
         case CSSPropertySpeak:
             return cssValuePool().createValue(style->speak());
-        case CSSPropertyWebkitTransform:
+        case CSSPropertyTransform:
             return computedTransform(renderer, style.get());
-        case CSSPropertyWebkitTransformOrigin: {
+        case CSSPropertyTransformOrigin: {
             RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
             if (renderer) {
@@ -2895 +2896 @@
             return list.release();
         }
+        case CSSPropertyTransformStyle:
         case CSSPropertyWebkitTransformStyle:
             return cssValuePool().createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat);
@@ -3186 +3188 @@
         case CSSPropertyWebkitMaskRepeatX:
         case CSSPropertyWebkitMaskRepeatY:
-        case CSSPropertyWebkitPerspectiveOriginX:
-        case CSSPropertyWebkitPerspectiveOriginY:
+        case CSSPropertyPerspectiveOriginX:
+        case CSSPropertyPerspectiveOriginY:
         case CSSPropertyWebkitTextStroke:
-        case CSSPropertyWebkitTransformOriginX:
-        case CSSPropertyWebkitTransformOriginY:
-        case CSSPropertyWebkitTransformOriginZ:
+        case CSSPropertyTransformOriginX:
+        case CSSPropertyTransformOriginY:
+        case CSSPropertyTransformOriginZ:
             break;
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1015 +1015 @@
         break;
 #endif
+    case CSSPropertyTransformStyle:
     case CSSPropertyWebkitTransformStyle:
         if (valueID == CSSValueFlat || valueID == CSSValuePreserve3d)
@@ -1173 +1174 @@
 #endif // CSS3_TEXT
     case CSSPropertyWebkitTextSecurity:
+    case CSSPropertyTransformStyle:
     case CSSPropertyWebkitTransformStyle:
     case CSSPropertyWebkitUserDrag:
@@ -1252 +1254 @@
 static bool parseTranslateTransformValue(MutableStyleProperties* properties, CSSPropertyID propertyID, const String& string, bool important)
 {
-    if (propertyID != CSSPropertyWebkitTransform)
+    if (propertyID != CSSPropertyTransform)
         return false;
     static const unsigned shortestValidTransformStringLength = 12;
@@ -1293 +1295 @@
     RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
     result->append(transformValue.releaseNonNull());
-    properties->addParsedProperty(CSSProperty(CSSPropertyWebkitTransform, result.release(), important));
+    properties->addParsedProperty(CSSProperty(CSSPropertyTransform, result.release(), important));
     return true;
 }
@@ -2616 +2618 @@
         return parseRegionThread(propId, important);
 #endif
-    case CSSPropertyWebkitTransform:
+    case CSSPropertyTransform:
         if (id == CSSValueNone)
             validPrimitive = true;
@@ -2628 +2630 @@
         }
         break;
-    case CSSPropertyWebkitTransformOrigin:
-    case CSSPropertyWebkitTransformOriginX:
-    case CSSPropertyWebkitTransformOriginY:
-    case CSSPropertyWebkitTransformOriginZ: {
+    case CSSPropertyTransformOrigin:
+    case CSSPropertyTransformOriginX:
+    case CSSPropertyTransformOriginY:
+    case CSSPropertyTransformOriginZ: {
         RefPtr<CSSValue> val1;
         RefPtr<CSSValue> val2;
@@ -2646 +2648 @@
         return false;
     }
-    case CSSPropertyWebkitPerspective:
+    case CSSPropertyPerspective:
         if (id == CSSValueNone)
             validPrimitive = true;
@@ -2661 +2663 @@
         }
         break;
-    case CSSPropertyWebkitPerspectiveOrigin:
-    case CSSPropertyWebkitPerspectiveOriginX:
-    case CSSPropertyWebkitPerspectiveOriginY: {
+    case CSSPropertyPerspectiveOrigin:
+    case CSSPropertyPerspectiveOriginX:
+    case CSSPropertyPerspectiveOriginY: {
         RefPtr<CSSValue> val1;
         RefPtr<CSSValue> val2;
@@ -3150 +3152 @@
 #endif // CSS3_TEXT
     case CSSPropertyWebkitTextSecurity:
+    case CSSPropertyTransformStyle:
     case CSSPropertyWebkitTransformStyle:
     case CSSPropertyWebkitUserDrag:
@@ -9776 +9779 @@
     propId2 = propId;
     propId3 = propId;
-    if (propId == CSSPropertyWebkitTransformOrigin) {
-        propId1 = CSSPropertyWebkitTransformOriginX;
-        propId2 = CSSPropertyWebkitTransformOriginY;
-        propId3 = CSSPropertyWebkitTransformOriginZ;
+    if (propId == CSSPropertyTransformOrigin) {
+        propId1 = CSSPropertyTransformOriginX;
+        propId2 = CSSPropertyTransformOriginY;
+        propId3 = CSSPropertyTransformOriginZ;
     }
 
     switch (propId) {
-        case CSSPropertyWebkitTransformOrigin:
-            if (!parseTransformOriginShorthand(value, value2, value3))
-                return false;
-            // parseTransformOriginShorthand advances the m_valueList pointer
-            break;
-        case CSSPropertyWebkitTransformOriginX: {
-            value = parsePositionX(*m_valueList);
-            if (value)
-                m_valueList->next();
-            break;
-        }
-        case CSSPropertyWebkitTransformOriginY: {
-            value = parsePositionY(*m_valueList);
-            if (value)
-                m_valueList->next();
-            break;
-        }
-        case CSSPropertyWebkitTransformOriginZ: {
-            ValueWithCalculation valueWithCalculation(*m_valueList->current());
-            if (validateUnit(valueWithCalculation, FLength))
-                value = createPrimitiveNumericValue(valueWithCalculation);
-            if (value)
-                m_valueList->next();
-            break;
-        }
-        default:
-            ASSERT_NOT_REACHED();
+    case CSSPropertyTransformOrigin:
+        if (!parseTransformOriginShorthand(value, value2, value3))
             return false;
+        // parseTransformOriginShorthand advances the m_valueList pointer
+        break;
+    case CSSPropertyTransformOriginX: {
+        value = parsePositionX(*m_valueList);
+        if (value)
+            m_valueList->next();
+        break;
+    }
+    case CSSPropertyTransformOriginY: {
+        value = parsePositionY(*m_valueList);
+        if (value)
+            m_valueList->next();
+        break;
+    }
+    case CSSPropertyTransformOriginZ: {
+        ValueWithCalculation valueWithCalculation(*m_valueList->current());
+        if (validateUnit(valueWithCalculation, FLength))
+            value = createPrimitiveNumericValue(valueWithCalculation);
+        if (value)
+            m_valueList->next();
+        break;
+    }
+    default:
+        ASSERT_NOT_REACHED();
+        return false;
     }
 
@@ -9820 +9823 @@
     propId1 = propId;
     propId2 = propId;
-    if (propId == CSSPropertyWebkitPerspectiveOrigin) {
-        propId1 = CSSPropertyWebkitPerspectiveOriginX;
-        propId2 = CSSPropertyWebkitPerspectiveOriginY;
+    if (propId == CSSPropertyPerspectiveOrigin) {
+        propId1 = CSSPropertyPerspectiveOriginX;
+        propId2 = CSSPropertyPerspectiveOriginY;
     }
 
     switch (propId) {
-        case CSSPropertyWebkitPerspectiveOrigin:
-            if (m_valueList->size() > 2)
-                return false;
-            parse2ValuesFillPosition(*m_valueList, value, value2);
-            break;
-        case CSSPropertyWebkitPerspectiveOriginX: {
-            value = parsePositionX(*m_valueList);
-            if (value)
-                m_valueList->next();
-            break;
-        }
-        case CSSPropertyWebkitPerspectiveOriginY: {
-            value = parsePositionY(*m_valueList);
-            if (value)
-                m_valueList->next();
-            break;
-        }
-        default:
-            ASSERT_NOT_REACHED();
+    case CSSPropertyPerspectiveOrigin:
+        if (m_valueList->size() > 2)
             return false;
+        parse2ValuesFillPosition(*m_valueList, value, value2);
+        break;
+    case CSSPropertyPerspectiveOriginX: {
+        value = parsePositionX(*m_valueList);
+        if (value)
+            m_valueList->next();
+        break;
+    }
+    case CSSPropertyPerspectiveOriginY: {
+        value = parsePositionY(*m_valueList);
+        if (value)
+            m_valueList->next();
+        break;
+    }
+    default:
+        ASSERT_NOT_REACHED();
+        return false;
     }
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -557 +557 @@
 -webkit-padding-end [SkipBuilder]
 -webkit-padding-start [SkipBuilder]
--webkit-perspective [ConditionalConverter=Perspective]
--webkit-perspective-origin [Longhands=-webkit-perspective-origin-x|-webkit-perspective-origin-y]
--webkit-perspective-origin-x [Converter=Length]
--webkit-perspective-origin-y [Converter=Length]
+perspective [ConditionalConverter=Perspective]
+-webkit-perspective = perspective
+perspective-origin [Longhands=perspective-origin-x|perspective-origin-y]
+-webkit-perspective-origin = perspective-origin
+perspective-origin-x [Converter=Length]
+-webkit-perspective-origin-x = perspective-origin-x
+perspective-origin-y [Converter=Length]
+-webkit-perspective-origin-y = perspective-origin-y
 -webkit-print-color-adjust [Inherited]
 -webkit-rtl-ordering [Inherited, Setter=setRTLOrdering, Initial=initialRTLOrdering]
@@ -600 +604 @@
 -webkit-text-stroke-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
 -webkit-text-stroke-width [Inherited, Converter=TextStrokeWidth]
--webkit-transform [Converter=Transform]
--webkit-transform-origin [Longhands=-webkit-transform-origin-x|-webkit-transform-origin-y|-webkit-transform-origin-z]
--webkit-transform-origin-x [Converter=Length]
--webkit-transform-origin-y [Converter=Length]
--webkit-transform-origin-z [Converter=ComputedLength<float>]
+transform [Converter=Transform]
+-webkit-transform = transform
+transform-origin [Longhands=transform-origin-x|transform-origin-y|transform-origin-z]
+-webkit-transform-origin = transform-origin
+transform-origin-x [Converter=Length]
+-webkit-transform-origin-x = transform-origin-x
+transform-origin-y [Converter=Length]
+-webkit-transform-origin-y = transform-origin-y
+transform-origin-z [Converter=ComputedLength<float>]
+-webkit-transform-origin-z = transform-origin-z
+transform-style [NameForMethods=TransformStyle3D]
+// 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.
 -webkit-transform-style [NameForMethods=TransformStyle3D]
 -webkit-transition [Longhands=-webkit-transition-property|-webkit-transition-duration|-webkit-transition-timing-function|-webkit-transition-delay]

trunk/Source/WebCore/css/StyleProperties.cpp

@@ -200 +200 @@
     case CSSPropertyWebkitTextStroke:
         return getShorthandValue(webkitTextStrokeShorthand());
-    case CSSPropertyWebkitPerspectiveOrigin:
-        return getShorthandValue(webkitPerspectiveOriginShorthand());
-    case CSSPropertyWebkitTransformOrigin:
-        return getShorthandValue(webkitTransformOriginShorthand());
+    case CSSPropertyPerspectiveOrigin:
+        return getShorthandValue(perspectiveOriginShorthand());
+    case CSSPropertyTransformOrigin:
+        return getShorthandValue(transformOriginShorthand());
     case CSSPropertyWebkitTransition:
         return getLayeredShorthandValue(webkitTransitionShorthand());
@@ -929 +929 @@
             shorthandPropertyID = CSSPropertyWebkitMask;
             break;
-        case CSSPropertyWebkitPerspectiveOriginX:
-        case CSSPropertyWebkitPerspectiveOriginY:
-            shorthandPropertyID = CSSPropertyWebkitPerspectiveOrigin;
-            break;
-        case CSSPropertyWebkitTransformOriginX:
-        case CSSPropertyWebkitTransformOriginY:
-        case CSSPropertyWebkitTransformOriginZ:
-            shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
+        case CSSPropertyPerspectiveOriginX:
+        case CSSPropertyPerspectiveOriginY:
+            shorthandPropertyID = CSSPropertyPerspectiveOrigin;
+            break;
+        case CSSPropertyTransformOriginX:
+        case CSSPropertyTransformOriginY:
+        case CSSPropertyTransformOriginZ:
+            shorthandPropertyID = CSSPropertyTransformOrigin;
             break;
         case CSSPropertyWebkitTransitionProperty:

trunk/Source/WebCore/css/WebKitCSSMatrix.cpp

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

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

@@ -222 +222 @@
         // maintaining the relative positions of the boxes in boxes to each
         // other.
-        setInlineStyleProperty(CSSPropertyWebkitTransform,
+        setInlineStyleProperty(CSSPropertyTransform,
             String::format("translate(-%.2f%%, -%.2f%%)", position.first, position.second));
 

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

@@ -426 +426 @@
 
     const CompositeAnimation& rendererAnimations = *m_compositeAnimations.get(&renderer);
-    if (!rendererAnimations.isAnimatingProperty(CSSPropertyWebkitTransform, false, AnimationBase::Running | AnimationBase::Paused))
+    if (!rendererAnimations.isAnimatingProperty(CSSPropertyTransform, false, AnimationBase::Running | AnimationBase::Paused))
         return true;
 

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

@@ -578 +578 @@
 public:
     PropertyWrapperAcceleratedTransform()
-        : PropertyWrapper<const TransformOperations&>(CSSPropertyWebkitTransform, &RenderStyle::transform, &RenderStyle::setTransform)
+        : PropertyWrapper<const TransformOperations&>(CSSPropertyTransform, &RenderStyle::transform, &RenderStyle::setTransform)
     {
     }
@@ -1238 +1238 @@
         new LengthPropertyWrapper<Length>(CSSPropertyTextIndent, &RenderStyle::textIndent, &RenderStyle::setTextIndent),
 
-        new PropertyWrapper<float>(CSSPropertyWebkitPerspective, &RenderStyle::perspective, &RenderStyle::setPerspective),
-        new LengthPropertyWrapper<Length>(CSSPropertyWebkitPerspectiveOriginX, &RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX),
-        new LengthPropertyWrapper<Length>(CSSPropertyWebkitPerspectiveOriginY, &RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY),
-        new LengthPropertyWrapper<Length>(CSSPropertyWebkitTransformOriginX, &RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX),
-        new LengthPropertyWrapper<Length>(CSSPropertyWebkitTransformOriginY, &RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY),
-        new PropertyWrapper<float>(CSSPropertyWebkitTransformOriginZ, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ),
+        new PropertyWrapper<float>(CSSPropertyPerspective, &RenderStyle::perspective, &RenderStyle::setPerspective),
+        new LengthPropertyWrapper<Length>(CSSPropertyPerspectiveOriginX, &RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX),
+        new LengthPropertyWrapper<Length>(CSSPropertyPerspectiveOriginY, &RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY),
+        new LengthPropertyWrapper<Length>(CSSPropertyTransformOriginX, &RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX),
+        new LengthPropertyWrapper<Length>(CSSPropertyTransformOriginY, &RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY),
+        new PropertyWrapper<float>(CSSPropertyTransformOriginZ, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ),
         new LengthPropertyWrapper<LengthSize>(CSSPropertyBorderTopLeftRadius, &RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius),
         new LengthPropertyWrapper<LengthSize>(CSSPropertyBorderTopRightRadius, &RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius),
@@ -1328 +1328 @@
         CSSPropertyColumnRule,
         CSSPropertyWebkitBorderRadius,
-        CSSPropertyWebkitTransformOrigin
+        CSSPropertyTransformOrigin
     };
     const unsigned animatableShorthandPropertiesCount = WTF_ARRAY_LENGTH(animatableShorthandProperties);

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

@@ -425 +425 @@
     for (auto& it : m_keyframeAnimations) {
         if (KeyframeAnimation* anim = it.value.get()) {
-            if (!anim->hasAnimationForProperty(CSSPropertyWebkitTransform))
+            if (!anim->hasAnimationForProperty(CSSPropertyTransform))
                 continue;
 
@@ -440 +440 @@
     for (auto& it : m_transitions) {
         if (ImplicitAnimation* anim = it.value.get()) {
-            if (anim->animatingProperty() != CSSPropertyWebkitTransform || !anim->hasStyle())
+            if (anim->animatingProperty() != CSSPropertyTransform || !anim->hasStyle())
                 continue;
 

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

@@ -108 +108 @@
         return true; // Non-boxes don't get transformed;
 
-    ASSERT(m_animatingProperty == CSSPropertyWebkitTransform);
+    ASSERT(m_animatingProperty == CSSPropertyTransform);
 
     RenderBox& box = downcast<RenderBox>(*m_object);

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

@@ -202 +202 @@
 bool KeyframeAnimation::computeExtentOfTransformAnimation(LayoutRect& bounds) const
 {
-    ASSERT(m_keyframes.containsProperty(CSSPropertyWebkitTransform));
+    ASSERT(m_keyframes.containsProperty(CSSPropertyTransform));
 
     if (!is<RenderBox>(m_object))
@@ -216 +216 @@
         const KeyframeValue& currKeyFrame = m_keyframes[i];
 
-        if (!currKeyFrame.containsProperty(CSSPropertyWebkitTransform))
+        if (!currKeyFrame.containsProperty(CSSPropertyTransform))
             continue;
 
@@ -360 +360 @@
     m_transformFunctionListValid = false;
     
-    if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitTransform))
+    if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyTransform))
         return;
 

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

@@ -552 +552 @@
 int GraphicsLayer::validateTransformOperations(const KeyframeValueList& valueList, bool& hasBigRotation)
 {
-    ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
+    ASSERT(valueList.property() == AnimatedPropertyTransform);
 
     hasBigRotation = false;

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

@@ -53 +53 @@
 enum AnimatedPropertyID {
     AnimatedPropertyInvalid,
-    AnimatedPropertyWebkitTransform,
+    AnimatedPropertyTransform,
     AnimatedPropertyOpacity,
     AnimatedPropertyBackgroundColor,

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

@@ -233 +233 @@
 {
     switch (property) {
-    case AnimatedPropertyWebkitTransform:
+    case AnimatedPropertyTransform:
         return "transform";
     case AnimatedPropertyOpacity:
@@ -610 +610 @@
             const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
 
-            if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
-                    || currAnimation.m_property == AnimatedPropertyBackgroundColor
-                    || currAnimation.m_property == AnimatedPropertyWebkitFilter
-                )
+            if (currAnimation.m_property == AnimatedPropertyTransform
+                || currAnimation.m_property == AnimatedPropertyOpacity
+                || currAnimation.m_property == AnimatedPropertyBackgroundColor
+                || currAnimation.m_property == AnimatedPropertyWebkitFilter)
                 moveOrCopyLayerAnimation(operation, animationIdentifier(currAnimation.m_name, currAnimation.m_property, currAnimation.m_index, currAnimation.m_subIndex), fromLayer, toLayer);
         }
@@ -885 +885 @@
 
     bool createdAnimations = false;
-    if (valueList.property() == AnimatedPropertyWebkitTransform)
+    if (valueList.property() == AnimatedPropertyTransform)
         createdAnimations = createTransformAnimationsFromKeyframes(valueList, anim, animationName, timeOffset, boxSize);
     else if (valueList.property() == AnimatedPropertyWebkitFilter) {
@@ -2408 +2408 @@
         for (size_t i = 0; i < numAnimations; ++i) {
             const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
-            if (currAnimation.m_property == AnimatedPropertyWebkitTransform)
+            if (currAnimation.m_property == AnimatedPropertyTransform)
                 return true;
         }
@@ -2532 +2532 @@
 bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset)
 {
-    ASSERT(valueList.property() != AnimatedPropertyWebkitTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
+    ASSERT(valueList.property() != AnimatedPropertyTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
 
     bool isKeyframe = valueList.size() > 2;
@@ -2583 +2583 @@
 bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset, const FloatSize& boxSize)
 {
-    ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
+    ASSERT(valueList.property() == AnimatedPropertyTransform);
 
     bool hasBigRotation;

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

@@ -562 +562 @@
     ASSERT(!keyframesName.isEmpty());
 
-    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity))
+    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity))
         return false;
 
@@ -568 +568 @@
     bool hasBigRotation;
 
-    if (valueList.property() == AnimatedPropertyWebkitTransform)
+    if (valueList.property() == AnimatedPropertyTransform)
         listsMatch = validateTransformOperations(valueList, hasBigRotation) >= 0;
 

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

@@ -230 +230 @@
         client->setAnimatedOpacity(applyOpacityAnimation((static_cast<const FloatAnimationValue&>(from).value()), (static_cast<const FloatAnimationValue&>(to).value()), progress));
         return;
-    case AnimatedPropertyWebkitTransform:
+    case AnimatedPropertyTransform:
         client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue&>(from).value(), static_cast<const TransformAnimationValue&>(to).value(), progress, m_boxSize, m_listsMatch));
         return;

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

@@ -657 +657 @@
 {
     m_animations.apply(this);
-    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
+    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
         m_currentTransform.setLocalTransform(m_state.transform);
     if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))

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

@@ -1154 +1154 @@
 bool CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation() const
 {
-    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
+    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
         return true;
 
@@ -1165 +1165 @@
 bool CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms()
 {
-    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
+    if (m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
         return true;
 
@@ -1181 +1181 @@
     ASSERT(!keyframesName.isEmpty());
 
-    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyWebkitFilter))
+    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyWebkitFilter))
         return false;
 
@@ -1187 +1187 @@
     bool ignoredHasBigRotation;
 
-    if (valueList.property() == AnimatedPropertyWebkitTransform)
+    if (valueList.property() == AnimatedPropertyTransform)
         listsMatch = validateTransformOperations(valueList, ignoredHasBigRotation) >= 0;
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -675 +675 @@
     // Set transform property, if it is not animating. We have to do this here because the transform
     // is affected by the layer dimensions.
-    if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
+    if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
         updateTransform(style);
 
@@ -2444 +2444 @@
 {
     bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
-    bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
+    bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyTransform);
     bool hasFilter = keyframes.containsProperty(CSSPropertyWebkitFilter);
 
@@ -2450 +2450 @@
         return false;
     
-    KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
+    KeyframeValueList transformVector(AnimatedPropertyTransform);
     KeyframeValueList opacityVector(AnimatedPropertyOpacity);
     KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
@@ -2466 +2466 @@
         
         bool isFirstOrLastKeyframe = key == 0 || key == 1;
-        if ((hasTransform && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitTransform))
+        if ((hasTransform && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyTransform))
             transformVector.insert(std::make_unique<TransformAnimationValue>(key, keyframeStyle->transform(), tf));
 
@@ -2524 +2524 @@
     }
 
-    if (property == CSSPropertyWebkitTransform && m_owningLayer.hasTransform()) {
-        const Animation* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
+    if (property == CSSPropertyTransform && m_owningLayer.hasTransform()) {
+        const Animation* transformAnim = toStyle->transitionForProperty(CSSPropertyTransform);
         if (transformAnim && !transformAnim->isEmptyOrZeroDuration()) {
-            KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
+            KeyframeValueList transformVector(AnimatedPropertyTransform);
             transformVector.insert(std::make_unique<TransformAnimationValue>(0, fromStyle->transform()));
             transformVector.insert(std::make_unique<TransformAnimationValue>(1, toStyle->transform()));
-            if (m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
+            if (m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyTransform), timeOffset)) {
                 // To ensure that the correct transform is visible when the animation ends, also set the final transform.
                 updateTransform(*toStyle);
@@ -2627 +2627 @@
     CSSPropertyID cssProperty = CSSPropertyInvalid;
     switch (property) {
-        case AnimatedPropertyWebkitTransform:
-            cssProperty = CSSPropertyWebkitTransform;
-            break;
-        case AnimatedPropertyOpacity:
-            cssProperty = CSSPropertyOpacity;
-            break;
-        case AnimatedPropertyBackgroundColor:
-            cssProperty = CSSPropertyBackgroundColor;
-            break;
-        case AnimatedPropertyWebkitFilter:
-            cssProperty = CSSPropertyWebkitFilter;
-            break;
-        case AnimatedPropertyInvalid:
-            ASSERT_NOT_REACHED();
+    case AnimatedPropertyTransform:
+        cssProperty = CSSPropertyTransform;
+        break;
+    case AnimatedPropertyOpacity:
+        cssProperty = CSSPropertyOpacity;
+        break;
+    case AnimatedPropertyBackgroundColor:
+        cssProperty = CSSPropertyBackgroundColor;
+        break;
+    case AnimatedPropertyWebkitFilter:
+        cssProperty = CSSPropertyWebkitFilter;
+        break;
+    case AnimatedPropertyInvalid:
+        ASSERT_NOT_REACHED();
     }
     return cssProperty;
@@ -2648 +2648 @@
 {
     switch (cssProperty) {
-        case CSSPropertyWebkitTransform:
-            return AnimatedPropertyWebkitTransform;
-        case CSSPropertyOpacity:
-            return AnimatedPropertyOpacity;
-        case CSSPropertyBackgroundColor:
-            return AnimatedPropertyBackgroundColor;
-        case CSSPropertyWebkitFilter:
-            return AnimatedPropertyWebkitFilter;
-        default:
-            // It's fine if we see other css properties here; they are just not accelerated.
-            break;
+    case CSSPropertyTransform:
+        return AnimatedPropertyTransform;
+    case CSSPropertyOpacity:
+        return AnimatedPropertyOpacity;
+    case CSSPropertyBackgroundColor:
+        return AnimatedPropertyBackgroundColor;
+    case CSSPropertyWebkitFilter:
+        return AnimatedPropertyWebkitFilter;
+    default:
+        // It's fine if we see other css properties here; they are just not accelerated.
+        break;
     }
     return AnimatedPropertyInvalid;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2613 +2613 @@
             && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
             || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitFilter, activeAnimationState)
-            || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, activeAnimationState);
+            || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyTransform, activeAnimationState);
 }
 
@@ -2811 +2811 @@
         return false;
 
-    return renderer.animation().isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused);
+    return renderer.animation().isRunningAnimationOnRenderer(renderer, CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused);
 }
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -159 +159 @@
     // FIXME: When CSS supports "transform-origin" this special case can be removed,
     // and we can add transform_originAttr to the table above instead.
-    map.add(transform_originAttr.localName().impl(), CSSPropertyWebkitTransformOrigin);
+    map.add(transform_originAttr.localName().impl(), CSSPropertyTransformOrigin);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-21  Dean Jackson  <dino@apple.com>
+
+        Remove the prefix for CSS Transforms
+        https://bugs.webkit.org/show_bug.cgi?id=142927
+        <rdar://problem/11568151>
+
+        Reviewed by Simon Fraser.
+
+        Rename AnimatedPropertyWebkitTransform to AnimatedPropertyTransform.
+
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+        (IPC::ArgumentCoder<TextureMapperAnimation>::encode):
+
 2015-03-21  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -446 +446 @@
             encoder << static_cast<const FloatAnimationValue&>(value).value();
             break;
-        case AnimatedPropertyWebkitTransform:
+        case AnimatedPropertyTransform:
             encoder << static_cast<const TransformAnimationValue&>(value).value();
             break;
@@ -528 +528 @@
             break;
         }
-        case AnimatedPropertyWebkitTransform: {
+        case AnimatedPropertyTransform: {
             TransformOperations transform;
             if (!decoder.decode(transform))