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

Timestamp:

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

Author:

mbensi

Message:

merge with webkit revision 35588

Files:

• trunk/WebCore/css/CSSStyleSelector.cpp (modified) (14 diffs)

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -71 +71 @@
-#include "Text.h"
-#include "UserAgentStyleSheets.h"
+#include "WebKitCSSKeyframeRule.h"
+#include "WebKitCSSKeyframesRule.h"
-#include "WebKitCSSTransformValue.h"
-#include "XMLNames.h"
@@ -183 +185 @@
-HANDLE_FILL_LAYER_VALUE(mask, Mask, prop, Prop, value)
-
+#define HANDLE_ANIMATION_INHERIT_AND_INITIAL(prop, Prop) \
+if (isInherit) { \
+    AnimationList* list = m_style->accessAnimations(); \
+    const AnimationList* parentList = m_parentStyle->animations(); \
+    size_t i = 0; \
+    for ( ; i < parentList->size() && (*parentList)[i]->is##Prop##Set(); ++i) { \
+        if (list->size() <= i) \
+            list->append(Animation::create()); \
+        (*list)[i]->set##Prop((*parentList)[i]->prop()); \
+    } \
+    \
+    /* Reset any remaining layers to not have the property set. */ \
+    for ( ; i < list->size(); ++i) \
+        (*list)[i]->clear##Prop(); \
+} \
+if (isInitial) { \
+    AnimationList* list = m_style->accessAnimations(); \
+    (*list)[0]->set##Prop(RenderStyle::initialAnimation##Prop()); \
+    for (size_t i = 1; i < list->size(); ++i) \
+        (*list)[0]->clear##Prop(); \
+}
+
+#define HANDLE_ANIMATION_VALUE(prop, Prop, value) { \
+HANDLE_ANIMATION_INHERIT_AND_INITIAL(prop, Prop) \
+if (isInherit || isInitial) \
+    return; \
+AnimationList* list = m_style->accessAnimations(); \
+size_t childIndex = 0; \
+if (value->isValueList()) { \
+    /* Walk each value and put it into a layer, creating new layers as needed. */ \
+    CSSValueList* valueList = static_cast<CSSValueList*>(value); \
+    for (unsigned int i = 0; i < valueList->length(); i++) { \
+        if (childIndex <= list->size()) \
+            list->append(Animation::create()); \
+        mapAnimation##Prop((*list)[childIndex].get(), valueList->itemWithoutBoundsCheck(i)); \
+        ++childIndex; \
+    } \
+} else { \
+    if (list->isEmpty()) \
+        list->append(Animation::create()); \
+    mapAnimation##Prop((*list)[childIndex].get(), value); \
+    childIndex = 1; \
+} \
+for ( ; childIndex < list->size(); ++childIndex) { \
+    /* Reset all remaining layers to not have the property set. */ \
+    (*list)[childIndex]->clear##Prop(); \
+} \
+}
+
-#define HANDLE_TRANSITION_INHERIT_AND_INITIAL(prop, Prop) \
-if (isInherit) { \
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    } \
-    \
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -216 +260 @@
-if (isInherit || isInitial) \
-    return; \
-Transition* currChild
-Transition* prevChild
+AnimationList* list
+size_t childIndex
-if (value->isValueList()) { \
-    /* Walk each value and put it into a layer, creating new layers as needed. */ \
-    CSSValueList* valueList = static_cast<CSSValueList*>(value); \
-    for (unsigned int i = 0; i < valueList->length(); i++) { \
-
-
-
-
-
-
-
-
+
+
+
+
-    } \
-} else { \
-
-
+
+
+
+
-} \
-while (currChild
+for ( ; childIndex < list->size(); ++childIndex
-    /* Reset all remaining layers to not have the property set. */ \
-currChild
-    currChild = currChild->next();
- }
+(*list)[childIndex]
+}
+
-
-#define HANDLE_INHERIT_COND(propID, prop, Prop) \
@@ -377 +419 @@
-}
-
+// this is a simplified style setting function for keyframe styles
+void CSSStyleSelector::addKeyframeStyle(Document* doc, const WebKitCSSKeyframesRule* rule)
+{
+    AtomicString s(rule->name());
+    RefPtr<KeyframeList> list;
+    if (m_keyframeRuleMap.contains(s.impl()))
+        list = m_keyframeRuleMap.get(s.impl()).get();
+    else {
+        list = KeyframeList::create(s);
+        m_keyframeRuleMap.add(s.impl(), list);
+    }
+    list->clear();
+                    
+    for (unsigned i = 0; i < rule->length(); ++i) {
+        const WebKitCSSKeyframeRule* kf = rule->item(i);
+        m_style = new (doc->renderArena()) RenderStyle();
+        m_style->ref();
+        CSSMutableStyleDeclaration* decl = kf->style();
+        DeprecatedValueListConstIterator<CSSProperty> end;
+        for (DeprecatedValueListConstIterator<CSSProperty> it = decl->valuesIterator(); it != end; ++it) {
+            const CSSProperty& current = *it;
+            applyProperty(current.id(), current.value());
+            list->addProperty(current.id());
+        }
+        list->insert(kf->key(), *m_style);
+        m_style->deref(doc->renderArena());
+        m_style = 0;
+    }
+}
+
-void CSSStyleSelector::init()
-{
@@ -394 +466 @@
-    delete m_userStyle;
-    deleteAllValues(m_viewportDependentMediaQueryResults);
+    m_keyframeRuleMap.clear();
-}
-
@@ -874 +947 @@
-                return false;
-            
-
+ || style->animations()
-                return false;
-
@@ -1330 +1403 @@
-    style->adjustMaskLayers();
-
-
+
+
-    style->adjustTransitions();
-
@@ -2325 +2399 @@
-                        for (CSSSelector* s = rule->selector(); s; s = s->next())
-                            addRule(rule, s);
-i
+childI
-                        // Add this font face to our set.
-                        const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(item);
-                        styleSelector->fontSelector()->addFontFaceRule(fontFaceRule);
+                    } else if (childItem->isKeyframesRule() && styleSelector) {
+                        // Add this keyframe rule to our set.
+                        const WebKitCSSKeyframesRule* keyframesRule = static_cast<WebKitCSSKeyframesRule*>(childItem);
+                        styleSelector->addKeyframeStyle(sheet->doc(), keyframesRule);
-                    }
-                }   // for rules
@@ -2341 +2419 @@
-            if (!variables->media() || medium.eval(variables->media(), styleSelector))
-                styleSelector->addVariables(variables);
+        } else if (item->isKeyframesRule()) {
+            WebKitCSSKeyframesRule* r = static_cast<WebKitCSSKeyframesRule*>(item);
+            styleSelector->addKeyframeStyle(sheet->doc(), r);
-        }
-    }
@@ -4753 +4834 @@
-        break;
-    }
+    case CSSPropertyWebkitAnimation:
+        if (isInitial)
+            m_style->clearAnimations();
+        else if (isInherit)
+            m_style->inheritAnimations(m_parentStyle->animations());
+        return;
+    case CSSPropertyWebkitAnimationDelay:
+        HANDLE_ANIMATION_VALUE(delay, Delay, value)
+        return;
+    case CSSPropertyWebkitAnimationDirection:
+        HANDLE_ANIMATION_VALUE(direction, Direction, value)
+        return;
+    case CSSPropertyWebkitAnimationDuration:
+        HANDLE_ANIMATION_VALUE(duration, Duration, value)
+        return;
+    case CSSPropertyWebkitAnimationIterationCount:
+        HANDLE_ANIMATION_VALUE(iterationCount, IterationCount, value)
+        return;
+    case CSSPropertyWebkitAnimationName:
+        HANDLE_ANIMATION_VALUE(name, Name, value)
+        return;
+    case CSSPropertyWebkitAnimationPlayState:
+        HANDLE_ANIMATION_VALUE(playState, PlayState, value)
+        return;
+    case CSSPropertyWebkitAnimationTimingFunction:
+        HANDLE_ANIMATION_VALUE(timingFunction, TimingFunction, value)
+        return;
-    case CSSPropertyWebkitTransition:
-        if (isInitial)
@@ -4759 +4867 @@
-            m_style->inheritTransitions(m_parentStyle->transitions());
-        return;
+    case CSSPropertyWebkitTransitionDelay:
+        HANDLE_TRANSITION_VALUE(delay, Delay, value)
+        return;
-    case CSSPropertyWebkitTransitionDuration:
-        HANDLE_TRANSITION_VALUE(duration, Duration, value)
-        return;
-RepeatCount
-repeatCount, RepeatCount
+Property
+property, Property
-        return;
-    case CSSPropertyWebkitTransitionTimingFunction:
-        HANDLE_TRANSITION_VALUE(timingFunction, TimingFunction, value)
-        return;
-    case CSSPropertyWebkitTransitionProperty:
-        HANDLE_TRANSITION_VALUE(property, Property, value)
-        return;
-    case CSSPropertyInvalid:
@@ -5011 +5119 @@
-}
-
-TransitionDuration(Transition* transi
+AnimationDelay(Animation* anima
-{
-    if (value->cssValueType() == CSSValue::CSS_INITIAL) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return;
-    }
@@ -5023 +5160 @@
-    CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-    if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_S)
-transition->setDuration(int(1000*primitiveValue->getFloatValue()
+animation->setDuration(primitiveValue->getFloatValue(
-    else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_MS)
-transition->setDuration(int(primitiveValue->getFloatValue())
-
-
-TransitionRepeatCount(Transition* transi
+animation->setDuration(primitiveValue->getFloatValue()/1000.0f
+
+
+AnimationIterationCount(Animation* anima
-{
-    if (value->cssValueType() == CSSValue::CSS_INITIAL) {
-transition->setRepeatCount(RenderStyle::initialTransitionRepeat
+animation->setIterationCount(RenderStyle::initialAnimationIteration
-        return;
-    }
@@ -5040 +5177 @@
-    CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-    if (primitiveValue->getIdent() == CSSValueInfinite)
-transition->setRepeat
+animation->setIteration
-    else
-transition->setRepeat
-
-
-TransitionTimingFunction(Transition* transition
+animation->setIteration
+
+
+AnimationName(Animation* layer
-{
-    if (value->cssValueType() == CSSValue::CSS_INITIAL) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (value->isPrimitiveValue()) {
-        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-        switch (primitiveValue->getIdent()) {
-            case CSSValueLinear:
-transi
+anima
-                break;
-            case CSSValueEase:
-transi
+anima
-                break;
-            case CSSValueEaseIn:
-transi
+anima
-                break;
-            case CSSValueEaseOut:
-transi
+anima
-                break;
-            case CSSValueEaseInOut:
-transi
-
-
-
-
-
-ransitionT
+anima
+
+
+
+
+
+
-        CSSTimingFunctionValue* timingFunction = static_cast<CSSTimingFunctionValue*>(value);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-