Changeset 30319 in webkit

Timestamp:

Feb 15, 2008 1:08:05 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17306 <rdar://problem/5737923> Transitions between styles that have different transition-* properties behave inconsistently

• manual-tests/transitions.html: Added.
• page/AnimationController.cpp: (WebCore::CompositeImplicitAnimation::animate): Changed to use the transition properties of the current style rather than the target style. (WebCore::AnimationControllerPrivate::get): Changed to not create an animation if the style does not have transitions. (WebCore::AnimationController::updateImplicitAnimations): Added code to return the target style if the current style is not animating.
• rendering/RenderObject.cpp: (WebCore::RenderObject::setAnimatableStyle): Changed to call updateImplicitAnimations() even if the current style does not have transitions, because we may be animating out of a style that had them.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/transitions.html (added)
• page/AnimationController.cpp (modified) (4 diffs)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-15  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17306
+          <rdar://problem/5737923> Transitions between styles that have different transition-* properties behave inconsistently
+
+        * manual-tests/transitions.html: Added.
+        * page/AnimationController.cpp:
+        (WebCore::CompositeImplicitAnimation::animate): Changed to use the
+        transition properties of the current style rather than the target style.
+        (WebCore::AnimationControllerPrivate::get): Changed to not create an
+        animation if the style does not have transitions.
+        (WebCore::AnimationController::updateImplicitAnimations): Added code to
+        return the target style if the current style is not animating.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setAnimatableStyle): Changed to call
+        updateImplicitAnimations() even if the current style does not have
+        transitions, because we may be animating out of a style that had them.
+
 2008-02-15  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/page/AnimationController.cpp

@@ -428 +428 @@
 RenderStyle* CompositeImplicitAnimation::animate(RenderObject* renderer, RenderStyle* currentStyle, RenderStyle* targetStyle)
 {
+    const Transition* currentTransitions = currentStyle->transitions();
+    const Transition* targetTransitions = targetStyle->transitions();
+    if (currentTransitions != targetTransitions && !(currentTransitions && targetTransitions && *currentTransitions == *targetTransitions)) {
+        reset(renderer);
+        deleteAllValues(m_animations);
+        m_animations.clear();
+    }
+
     // Get the animation layers from the target style.
     // For each one, we need to create a new animation unless one exists already (later occurrences of duplicate
     // triggers in the layer list get ignored).
     if (m_animations.isEmpty()) {
-        for (const Transition* transition = targetStyle->transitions(); transition; transition = transition->next()) {
+        for (const Transition* transition = currentTransitions; transition; transition = transition->next()) {
             int property = transition->transitionProperty();
             int duration = transition->transitionDuration();
@@ -449 +457 @@
     for (HashMap<int, ImplicitAnimation*>::iterator it = m_animations.begin(); it != end; ++it)
         it->second->animate(this, renderer, currentStyle, targetStyle, result);
-    
+
     if (result)
         return result;
@@ -505 +513 @@
 {
     CompositeImplicitAnimation* animation = m_animations.get(renderer);
-    if (!animation) {
+    if (!animation && renderer->style()->transitions()) {
         animation = new CompositeImplicitAnimation();
         m_animations.set(renderer, animation);
@@ -585 +593 @@
     // a new style.
     ASSERT(renderer->element()); // FIXME: We do not animate generated content yet.
-    
+
     CompositeImplicitAnimation* animation = m_data->get(renderer);
+    if (!animation)
+        return newStyle;
+
     RenderStyle* result = animation->animate(renderer, renderer->style(), newStyle);
     m_data->updateTimer();

trunk/WebCore/rendering/RenderObject.cpp

@@ -2147 +2147 @@
 void RenderObject::setAnimatableStyle(RenderStyle* style)
 {
-    if (!isText() && m_style && style) {
-        if (!m_style->transitions())
-            animationController()->cancelImplicitAnimations(this);
-        else
-            style = animationController()->updateImplicitAnimations(this, style);
-    }
+    if (!isText() && m_style && style)
+        style = animationController()->updateImplicitAnimations(this, style);
+
     setStyle(style);
 }