Changeset 39090 in webkit

Timestamp:

Dec 7, 2008 10:58:57 PM (15 years ago)

Author:

Simon Fraser

Message:

2008-12-07 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein

​https://bugs.webkit.org/show_bug.cgi?id=22594

Fix issues which break reading inline style for -webkit-transition
and -webkit-transform-origin.

Test: fast/css/transform-inline-style.html

• css/CSSMutableStyleDeclaration.cpp: (WebCore::CSSMutableStyleDeclaration::getPropertyValue): Add cases for CSSPropertyWebkitTransformOrigin and CSSPropertyWebkitTransition so that these shorthand properties are returned correctly.
• css/CSSParser.cpp: (WebCore::CSSParser::parseAnimationProperty): Create CSSPrimitiveValues with the correct CSSValueAll and CSSValueNone identifiers, not the RenderStyle-level cAnimateAll, cAnimateNone.
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::mapAnimationProperty): Special-case CSSValueAll and CSSValueNone values to set cAnimateAll and cAnimateNone transition properties.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/transform-inline-style-expected.txt (added)
• LayoutTests/fast/css/transform-inline-style.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSMutableStyleDeclaration.cpp (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-12-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        https://bugs.webkit.org/show_bug.cgi?id=22594
+        
+        Testcase for fetching inline style for -webkit-transform-origin
+        and -webkit-transition.
+
+        * fast/css/transform-inline-style-expected.txt: Added.
+        * fast/css/transform-inline-style.html: Added.
+
 2008-12-07  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        https://bugs.webkit.org/show_bug.cgi?id=22594
+
+        Fix issues which break reading inline style for -webkit-transition
+        and -webkit-transform-origin.
+        
+        Test: fast/css/transform-inline-style.html
+
+        * css/CSSMutableStyleDeclaration.cpp:
+        (WebCore::CSSMutableStyleDeclaration::getPropertyValue): Add cases 
+        for CSSPropertyWebkitTransformOrigin and CSSPropertyWebkitTransition
+        so that these shorthand properties are returned correctly.
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseAnimationProperty): Create CSSPrimitiveValues
+        with the correct CSSValueAll and CSSValueNone identifiers, not the
+        RenderStyle-level cAnimateAll, cAnimateNone.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::mapAnimationProperty): Special-case CSSValueAll
+        and CSSValueNone values to set cAnimateAll and cAnimateNone transition properties.
+
 2008-12-07  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/css/CSSMutableStyleDeclaration.cpp

@@ -216 +216 @@
                                        CSSPropertyWebkitMaskOrigin };
             return getLayeredShorthandValue(properties, 6);
+        }
+        case CSSPropertyWebkitTransformOrigin: {
+            const int properties[2] = { CSSPropertyWebkitTransformOriginX,
+                                        CSSPropertyWebkitTransformOriginY };
+            return getShorthandValue(properties, 2);
+        }
+        case CSSPropertyWebkitTransition: {
+            const int properties[4] = { CSSPropertyWebkitTransitionProperty, CSSPropertyWebkitTransitionDuration,
+                                        CSSPropertyWebkitTransitionTimingFunction, CSSPropertyWebkitTransitionDelay };
+            return getLayeredShorthandValue(properties, 4);
         }
 #if ENABLE(SVG)

trunk/WebCore/css/CSSParser.cpp

@@ -2359 +2359 @@
         return CSSPrimitiveValue::createIdentifier(result);
     if (equalIgnoringCase(value->string, "all"))
-        return CSSPrimitiveValue::createIdentifier(cAnimateAll); // FIXME: Why not use CSSValueAll instead?
+        return CSSPrimitiveValue::createIdentifier(CSSValueAll);
     if (equalIgnoringCase(value->string, "none"))
-        return CSSPrimitiveValue::createIdentifier(cAnimateNone); // FIXME: Why not use CSSValueNone instead?
+        return CSSPrimitiveValue::createIdentifier(CSSValueNone);
     return 0;
 }

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -5325 +5325 @@
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-    animation->setProperty(static_cast<CSSPropertyID>(primitiveValue->getIdent()));
+    if (primitiveValue->getIdent() == CSSValueAll)
+        animation->setProperty(cAnimateAll);
+    else if (primitiveValue->getIdent() == CSSValueNone)
+        animation->setProperty(cAnimateNone);
+    else
+        animation->setProperty(static_cast<CSSPropertyID>(primitiveValue->getIdent()));
 }