Changeset 431 for trunk/WebCore/css/CSSParser.cpp

Timestamp:

08/06/08 13:29:36 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35588

Files:

• trunk/WebCore/css/CSSParser.cpp (modified) (20 diffs)

trunk/WebCore/css/CSSParser.cpp

@@ -66 +66 @@
-#include "Rect.h"
-#include "ShadowValue.h"
+#include "WebKitCSSKeyframeRule.h"
+#include "WebKitCSSKeyframesRule.h"
-#include "WebKitCSSTransformValue.h"
-#include <kjs/dtoa.h>
@@ -230 +232 @@
-    cssyyparse(this);
-    return m_rule.release();
+}
+
+PassRefPtr<CSSRule> CSSParser::parseKeyframeRule(CSSStyleSheet *sheet, const String &string)
+{
+    m_styleSheet = sheet;
+    setupParser("@-webkit-keyframe-rule{ ", string, "} ");
+    cssyyparse(this);
+    return m_keyframe.release();
-}
-
@@ -1295 +1305 @@
-        return false;
-    }
+    case CSSPropertyWebkitAnimationDelay:
+    case CSSPropertyWebkitAnimationDirection:
+    case CSSPropertyWebkitAnimationDuration:
+    case CSSPropertyWebkitAnimationName:
+    case CSSPropertyWebkitAnimationPlayState:
+    case CSSPropertyWebkitAnimationIterationCount:
+    case CSSPropertyWebkitAnimationTimingFunction:
+    case CSSPropertyWebkitTransitionDelay:
-    case CSSPropertyWebkitTransitionDuration:
-    case CSSPropertyWebkitTransitionRepeatCount:
-    case CSSPropertyWebkitTransitionTimingFunction:
-    case CSSPropertyWebkitTransitionProperty: {
-        RefPtr<CSSValue> val;
-Transi
+Anima
-            addProperty(propId, val.release(), important);
-            return true;
@@ -1554 +1571 @@
-        return parseShorthand(propId, properties, 2, important);
-    }
+    case CSSPropertyWebkitAnimation:
+        return parseAnimationShorthand(important);
-    case CSSPropertyWebkitTransition:
-        return parseTransitionShorthand(important);
@@ -1691 +1710 @@
-}
-
-Transi
+Anima
-{
-    if (lval) {
@@ -1708 +1727 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
-    const int numProperties = sizeof(properties) / sizeof(properties[0]);
-    
-Transi
+Anima
-
-    bool parsedProperty[numProperties] = { false }; // compiler will repeat false as necessary
@@ -1727 +1750 @@
-            for (i = 0; i < numProperties; ++i) {
-                if (!parsedProperty[i])
-Transi
+Anima
-                parsedProperty[i] = false;
-            }
@@ -1738 +1761 @@
-            if (!parsedProperty[i]) {
-                RefPtr<CSSValue> val;
-Transi
+Anima
-                    parsedProperty[i] = found = true;
-Transi
+Anima
-                }
-            }
@@ -1754 +1777 @@
-    for (i = 0; i < numProperties; ++i) {
-        if (!parsedProperty[i])
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -2207 +2287 @@
-}
-
-TransitionDuration
+AnimationDelay
-{
-    CSSParserValue* value = m_valueList->current();
+    if (value->id == CSSValueNow)
+        return CSSPrimitiveValue::createIdentifier(value->id);
-    if (validUnit(value, FTime, m_strict))
-        return CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitTypes)value->unit);
@@ -2215 +2297 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    CSSParserValue* value = m_valueList->current();
@@ -2222 +2320 @@
-    if (validUnit(value, FInteger|FNonNeg, m_strict))
-        return CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitTypes)value->unit);
+    return 0;
+}
+
+PassRefPtr<CSSValue> CSSParser::parseAnimationName()
+{
+    CSSParserValue* value = m_valueList->current();
+    if (value->unit == CSSPrimitiveValue::CSS_STRING || value->unit == CSSPrimitiveValue::CSS_IDENT) {
+        if (value->id == CSSValueNone || (value->unit == CSSPrimitiveValue::CSS_STRING && equalIgnoringCase(value->string, "none"))) {
+            return CSSPrimitiveValue::createIdentifier(CSSValueNone);
+        } else {
+            return CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_STRING);
+        }
+    }
+    return 0;
+}
+
+PassRefPtr<CSSValue> CSSParser::parseAnimationPlayState()
+{
+    CSSParserValue* value = m_valueList->current();
+    if (value->id == CSSValueRunning || value->id == CSSValuePaused)
+        return CSSPrimitiveValue::createIdentifier(value->id);
+    return 0;
+}
+
+PassRefPtr<CSSValue> CSSParser::parseAnimationProperty()
+{
+    CSSParserValue* value = m_valueList->current();
+    if (value->unit != CSSPrimitiveValue::CSS_IDENT)
+        return 0;
+    int result = cssPropertyID(value->string);
+    if (result)
+        return CSSPrimitiveValue::createIdentifier(result);
+    if (equalIgnoringCase(value->string, "all"))
+        return CSSPrimitiveValue::createIdentifier(cAnimateAll); // FIXME: Why not use CSSValueAll instead?
+    if (equalIgnoringCase(value->string, "none"))
+        return CSSPrimitiveValue::createIdentifier(cAnimateNone); // FIXME: Why not use CSSValueNone instead?
-    return 0;
-}
@@ -2243 +2377 @@
-}
-
-Transi
+Anima
-{
-    CSSParserValue* value = m_valueList->current();
@@ -2273 +2407 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-{
-    RefPtr<CSSValueList> values;
@@ -2307 +2426 @@
-        else {
-            switch (propId) {
-
-
+
+
+
-                    if (currValue)
-                        m_valueList->next();
-                    break;
-TransitionRepeatCount
-TransitionRepeatCount
+AnimationDirection
+AnimationDirection
-                    if (currValue)
-                        m_valueList->next();
-                    break;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    if (currValue)
-                        m_valueList->next();
-                    break;
-                case CSSPropertyWebkitTransitionProperty:
-
+
+
+
+
+
+
+
-                    if (currValue)
-                        m_valueList->next();
@@ -2361 +2503 @@
-    return false;
-}
+
+
-
-#if ENABLE(DASHBOARD_SUPPORT)
@@ -3908 +4052 @@
-    // The transform is a list of functional primitives that specify transform operations.
-    // We collect a list of WebKitCSSTransformValues, where each value specifies a single operation.
-Comma
+Space
-    for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
-        if (value->unit != CSSParserValue::Function || !value->function)
@@ -4042 +4186 @@
-    case CHARSET_SYM:
-    case NAMESPACE_SYM:
+    case WEBKIT_KEYFRAMES_SYM:
-
-    case IMPORTANT_SYM:
@@ -4383 +4528 @@
-}
-
+WebKitCSSKeyframesRule* CSSParser::createKeyframesRule()
+{
+    RefPtr<WebKitCSSKeyframesRule> rule = WebKitCSSKeyframesRule::create(m_styleSheet);
+    WebKitCSSKeyframesRule* rulePtr = rule.get();
+    m_parsedStyleObjects.append(rule.release());
+    return rulePtr;
+}
+
-CSSRule* CSSParser::createStyleRule(CSSSelector* selector)
-{
@@ -4530 +4683 @@
-
-    m_numParsedProperties -= deletedProperties;
+}
+
+WebKitCSSKeyframeRule* CSSParser::createKeyframeRule(float key)
+{
+    RefPtr<WebKitCSSKeyframeRule> keyframe = WebKitCSSKeyframeRule::create(m_styleSheet);
+
+    keyframe->setKey(key);
+    keyframe->setDeclaration(CSSMutableStyleDeclaration::create(0, m_parsedProperties, m_numParsedProperties));
+    clearProperties();
+
+    WebKitCSSKeyframeRule* keyframePtr = keyframe.get();
+    m_parsedStyleObjects.append(keyframe.release());
+    return keyframePtr;
-}
-