Changeset 57390 in webkit

Timestamp:

Apr 9, 2010 6:00:18 PM (14 years ago)

Author:

cmarrin@apple.com

Message:

Reviewed by Simon Fraser.

Fixed bug where animation time was not updated when dynamically loading a style sheet
​https://bugs.webkit.org/show_bug.cgi?id=37352

A dynamically loaded style sheet kicks off its own styleRecalc cycle. This was not
bracketed with a beginAnimationUpdate/endAnimationUpdate which wasn't resetting the
animation time. In some time-dependent cases this was causing a negative elapsedTime
to be sent to the keyframe animator. This is an invalid case which destroys the
animation prematurely. I not only added the brackets, but I also added an assert
and protection for when the elapsedTime comes up negative.

Test: animations/dynamic-stylesheet-loading.html

• dom/Document.cpp: Added brackets (WebCore::Document::updateStyleSelector):
• page/animation/KeyframeAnimation.cpp: Added assert and protection (WebCore::KeyframeAnimation::getKeyframeAnimationInterval):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/dynamic-stylesheet-loading-expected.txt (added)
• LayoutTests/animations/dynamic-stylesheet-loading.html (added)
• LayoutTests/animations/resources/dynamic-stylesheet-insertion-inserted.css (added)
• LayoutTests/animations/resources/dynamic-stylesheet-insertion-main.css (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/page/animation/KeyframeAnimation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-09  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fixed bug where animation time was not updated when dynamically loading a style sheet
+        https://bugs.webkit.org/show_bug.cgi?id=37352
+
+        LayoutTest showing problem.
+
+        * animations/dynamic-stylesheet-loading-expected.txt: Added.
+        * animations/dynamic-stylesheet-loading.html: Added.
+        * animations/resources/dynamic-stylesheet-insertion-inserted.css: Added.
+        * animations/resources/dynamic-stylesheet-insertion-main.css: Added.
+
 2010-04-09  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fixed bug where animation time was not updated when dynamically loading a style sheet
+        https://bugs.webkit.org/show_bug.cgi?id=37352
+
+        A dynamically loaded style sheet kicks off its own styleRecalc cycle. This was not
+        bracketed with a beginAnimationUpdate/endAnimationUpdate which wasn't resetting the
+        animation time. In some time-dependent cases this was causing a negative elapsedTime
+        to be sent to the keyframe animator. This is an invalid case which destroys the
+        animation prematurely. I not only added the brackets, but I also added an assert
+        and protection for when the elapsedTime comes up negative.
+
+        Test: animations/dynamic-stylesheet-loading.html
+
+        * dom/Document.cpp: Added brackets
+        (WebCore::Document::updateStyleSelector):
+        * page/animation/KeyframeAnimation.cpp: Added assert and protection
+        (WebCore::KeyframeAnimation::getKeyframeAnimationInterval):
+
 2010-04-09  Jaime Yap  <jaimeyap@google.com>
 

trunk/WebCore/dom/Document.cpp

@@ -2484 +2484 @@
 
     recalcStyleSelector();
+    // This recalcStyle initiates a new recalc cycle. We need to bracket it to
+    // make sure animations get the correct update time
+    if (m_frame)
+        m_frame->animation()->beginAnimationUpdate();
     recalcStyle(Force);
+    if (m_frame)
+        m_frame->animation()->endAnimationUpdate();
 
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING

trunk/WebCore/page/animation/KeyframeAnimation.cpp

@@ -69 +69 @@
 
     double t = m_animation->duration() ? (elapsedTime / m_animation->duration()) : 1;
+
+    ASSERT(t >= 0);
+    if (t < 0)
+        t = 0;
+
     int i = static_cast<int>(t);
     t -= i;