Changeset 31485 in webkit

Timestamp:

Mar 31, 2008 3:29:48 PM (16 years ago)

Author:

mitz@apple.com

Message:

2008-03-31 Dan Bernstein <​mitz@apple.com>

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=18076 Box disappears after CSS Transition completes

• page/AnimationController.cpp: Changed the BLEND_MAYBE_INVALID_COLOR macro to not blend two invalid colors.
• rendering/RenderStyle.cpp: (WebCore::StyleBackgroundData::StyleBackgroundData): Added missing copying of the m_color data member.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/AnimationController.cpp (modified) (1 diff)
• rendering/RenderStyle.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-31  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=18076
+          Box disappears after CSS Transition completes
+
+        * page/AnimationController.cpp: Changed the BLEND_MAYBE_INVALID_COLOR
+        macro to not blend two invalid colors.
+        * rendering/RenderStyle.cpp:
+        (WebCore::StyleBackgroundData::StyleBackgroundData): Added missing
+        copying of the m_color data member.
+
 2008-03-31  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/WebCore/page/AnimationController.cpp

@@ -334 +334 @@
         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; \
+        if (fromColor.isValid() || toColor.isValid()) { \
+            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; \
+            }\
         }\
     }\

trunk/WebCore/rendering/RenderStyle.cpp

@@ -330 +330 @@
     : RefCounted<StyleBackgroundData>()
     , m_background(o.m_background)
+    , m_color(o.m_color)
     , m_outline(o.m_outline)
 {