Changeset 30039 in webkit

Timestamp:

Feb 6, 2008 8:01:09 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?17093 'border-color' does not animate to the value of 'color' when unspecified

Test: fast/css/transition-color-unspecified.html

• page/AnimationController.cpp: (WebCore::ImplicitAnimation::animate): Changed to use the value of the 'color' property in the source or destination style as the source or destination value of properties whose inital value is defined to be the computed value of 'color'.

LayoutTests:

Reviewed by Darin Adler.

• test for ​http://bugs.webkit.org/show_bug.cgi?17093 'border-color' does not animate to the value of 'color' when unspecified

• fast/css/transition-color-unspecified.html: Added.
• platform/mac/fast/css/transition-color-unspecified-expected.checksum: Added.
• platform/mac/fast/css/transition-color-unspecified-expected.png: Added.
• platform/mac/fast/css/transition-color-unspecified-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/transition-color-unspecified.html (added)
• LayoutTests/platform/mac/fast/css/transition-color-unspecified-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/transition-color-unspecified-expected.png (added)
• LayoutTests/platform/mac/fast/css/transition-color-unspecified-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/AnimationController.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-06  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?17093
+        'border-color' does not animate to the value of 'color' when unspecified
+
+        * fast/css/transition-color-unspecified.html: Added.
+        * platform/mac/fast/css/transition-color-unspecified-expected.checksum: Added.
+        * platform/mac/fast/css/transition-color-unspecified-expected.png: Added.
+        * platform/mac/fast/css/transition-color-unspecified-expected.txt: Added.
+
 2008-02-05  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-06  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?17093
+        'border-color' does not animate to the value of 'color' when unspecified
+
+        Test: fast/css/transition-color-unspecified.html
+
+        * page/AnimationController.cpp:
+        (WebCore::ImplicitAnimation::animate): Changed to use the value of the
+        'color' property in the source or destination style as the source or
+        destination value of properties whose inital value is defined to be the
+        computed value of 'color'.
+
 2008-02-06  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/page/AnimationController.cpp

@@ -327 +327 @@
     }\
 
+#define BLEND_MAYBE_INVALID_COLOR(prop, getter, setter) \
+    if (m_property == prop && m_toStyle->getter() != targetStyle->getter()) \
+        reset(renderer, currentStyle, targetStyle); \
+    \
+    if ((m_property == cAnimateAll && !animation->hasAnimationForProperty(prop)) || m_property == prop) { \
+        Color fromColor = m_fromStyle->getter(); \
+        Color toColor = m_toStyle->getter(); \
+        if (!fromColor.isValid()) \
+            fromColor = m_fromStyle->color(); \
+        if (!toColor.isValid()) \
+            toColor = m_toStyle->color(); \
+        if (fromColor != toColor) {\
+            m_finished = false; \
+            if (!animatedStyle) \
+                animatedStyle = new (renderer->renderArena()) RenderStyle(*targetStyle); \
+            animatedStyle->setter(blendFunc(fromColor, toColor, progress()));\
+            if (m_property == prop) \
+                return; \
+        }\
+    }\
+
 #define BLEND_SHADOW(prop, getter, setter) \
     if (m_property == prop && (!m_toStyle->getter() || !targetStyle->getter() || *m_toStyle->getter() != *targetStyle->getter())) \
@@ -373 +394 @@
     BLEND(CSS_PROP_COLOR, color, setColor);
     BLEND(CSS_PROP_BACKGROUND_COLOR, backgroundColor, setBackgroundColor);
-    BLEND(CSS_PROP__WEBKIT_COLUMN_RULE_COLOR, columnRuleColor, setColumnRuleColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP__WEBKIT_COLUMN_RULE_COLOR, columnRuleColor, setColumnRuleColor);
     BLEND(CSS_PROP__WEBKIT_COLUMN_RULE_WIDTH, columnRuleWidth, setColumnRuleWidth);
     BLEND(CSS_PROP__WEBKIT_COLUMN_GAP, columnGap, setColumnGap);
     BLEND(CSS_PROP__WEBKIT_COLUMN_COUNT, columnCount, setColumnCount);
     BLEND(CSS_PROP__WEBKIT_COLUMN_WIDTH, columnWidth, setColumnWidth);
-    BLEND(CSS_PROP__WEBKIT_TEXT_STROKE_COLOR, textStrokeColor, setTextStrokeColor);
-    BLEND(CSS_PROP__WEBKIT_TEXT_FILL_COLOR, textFillColor, setTextFillColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP__WEBKIT_TEXT_STROKE_COLOR, textStrokeColor, setTextStrokeColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP__WEBKIT_TEXT_FILL_COLOR, textFillColor, setTextFillColor);
     BLEND(CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING, horizontalBorderSpacing, setHorizontalBorderSpacing);
     BLEND(CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING, verticalBorderSpacing, setVerticalBorderSpacing);
-    BLEND(CSS_PROP_BORDER_LEFT_COLOR, borderLeftColor, setBorderLeftColor);
-    BLEND(CSS_PROP_BORDER_RIGHT_COLOR, borderRightColor, setBorderRightColor);
-    BLEND(CSS_PROP_BORDER_TOP_COLOR, borderTopColor, setBorderTopColor);
-    BLEND(CSS_PROP_BORDER_BOTTOM_COLOR, borderBottomColor, setBorderBottomColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP_BORDER_LEFT_COLOR, borderLeftColor, setBorderLeftColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP_BORDER_RIGHT_COLOR, borderRightColor, setBorderRightColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP_BORDER_TOP_COLOR, borderTopColor, setBorderTopColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP_BORDER_BOTTOM_COLOR, borderBottomColor, setBorderBottomColor);
     BLEND(CSS_PROP_Z_INDEX, zIndex, setZIndex);
     BLEND(CSS_PROP_LINE_HEIGHT, lineHeight, setLineHeight);
-    BLEND(CSS_PROP_OUTLINE_COLOR, outlineColor, setOutlineColor);
+    BLEND_MAYBE_INVALID_COLOR(CSS_PROP_OUTLINE_COLOR, outlineColor, setOutlineColor);
     BLEND(CSS_PROP_OUTLINE_OFFSET, outlineOffset, setOutlineOffset);
     BLEND(CSS_PROP_OUTLINE_WIDTH, outlineWidth, setOutlineWidth);