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

Timestamp:

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

Author:

mbensi

Message:

merge with webkit revision 35588

Files:

• trunk/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (4 diffs)

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -30 +30 @@
-#include "CSSPropertyNames.h"
-#include "CSSReflectValue.h"
+#include "CSSTimingFunctionValue.h"
-#include "CSSValueList.h"
-#include "CachedImage.h"
@@ -188 +189 @@
-    CSSPropertyWebkitTransformOriginX,
-    CSSPropertyWebkitTransformOriginY,
+    CSSPropertyWebkitTransitionDelay,
+    CSSPropertyWebkitTransitionDuration,
+    CSSPropertyWebkitTransitionProperty,
+    CSSPropertyWebkitTransitionTimingFunction,
-    CSSPropertyWebkitUserDrag,
-    CSSPropertyWebkitUserModify,
@@ -1056 +1061 @@
-            else
-                return CSSPrimitiveValue::create(style->transformOriginY());
+        case CSSPropertyWebkitTransitionDelay: {
+            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+            const AnimationList* t = style->transitions();
+            if (t) {
+                for (size_t i = 0; i < t->size(); ++i)
+                    list->append(CSSPrimitiveValue::create((*t)[i]->delay(), CSSPrimitiveValue::CSS_S));
+            }
+            else
+                list->append(CSSPrimitiveValue::create(RenderStyle::initialAnimationDelay(), CSSPrimitiveValue::CSS_S));
+            return list.release();
+        }
+        case CSSPropertyWebkitTransitionDuration: {
+            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+            const AnimationList* t = style->transitions();
+            if (t) {
+                for (size_t i = 0; i < t->size(); ++i)
+                    list->append(CSSPrimitiveValue::create((*t)[i]->duration(), CSSPrimitiveValue::CSS_S));
+            }
+            else
+                list->append(CSSPrimitiveValue::create(RenderStyle::initialAnimationDuration(), CSSPrimitiveValue::CSS_S));
+            return list.release();
+        }
+        case CSSPropertyWebkitTransitionTimingFunction: {
+            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+            const AnimationList* t = style->transitions();
+            if (t) {
+                for (size_t i = 0; i < t->size(); ++i) {
+                    const TimingFunction& tf = (*t)[i]->timingFunction();
+                    list->append(CSSTimingFunctionValue::create(tf.x1(), tf.y1(), tf.x2(), tf.y2()));
+                }
+            }
+            else {
+                const TimingFunction& tf = RenderStyle::initialAnimationTimingFunction();
+                list->append(CSSTimingFunctionValue::create(tf.x1(), tf.y1(), tf.x2(), tf.y2()));
+            }
+            return list.release();
+        }
+        case CSSPropertyWebkitTransitionProperty: {
+            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+            const AnimationList* t = style->transitions();
+            if (t) {
+                for (size_t i = 0; i < t->size(); ++i) {
+                    int prop = (*t)[i]->property();
+                    const char* name;
+                    if (prop == cAnimateNone)
+                        name = "none";
+                    else if (prop == cAnimateAll)
+                        name = "all";
+                    else
+                        name = getPropertyName(static_cast<CSSPropertyID>(prop));
+                    list->append(CSSPrimitiveValue::create(name, CSSPrimitiveValue::CSS_STRING));
+                }
+            }
+            else
+                list->append(CSSPrimitiveValue::create("all", CSSPrimitiveValue::CSS_STRING));
+            return list.release();
+        }
-        case CSSPropertyBackground:
-        case CSSPropertyBorder:
@@ -1113 +1175 @@
-        case CSSPropertyWebkitPaddingStart:
-        case CSSPropertyWebkitTextStroke:
-        case CSSPropertyWebkitTransition:
-        case CSSPropertyWebkitTransitionDuration:
-        case CSSPropertyWebkitTransitionProperty:
-        case CSSPropertyWebkitTransitionRepeatCount:
-        case CSSPropertyWebkitTransitionTimingFunction:
-            // FIXME: The above are unimplemented.
-            break;