Changeset 91187 in webkit

Timestamp:

Jul 18, 2011 9:16:17 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

AnimationBase asserts if a test tries to pause during the delay phase
​https://bugs.webkit.org/show_bug.cgi?id=59475

Patch by Young Han Lee <​joybro@company100.net> on 2011-07-18
Reviewed by Simon Fraser.

There is no more assertion failure after r90765, but the testcase still fails due to
the miscalculation of the pauseTime. This patch pauses the animation at its startTime
if a test tries to pause it during the delay phase.

Source/WebCore:

Test: transitions/transition-in-delay-phase.html

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::freezeAtTime):

LayoutTests:

• transitions/transition-in-delay-phase-expected.txt: Added.
• transitions/transition-in-delay-phase.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transitions/transition-in-delay-phase-expected.txt (added)
• LayoutTests/transitions/transition-in-delay-phase.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/AnimationBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-18  Young Han Lee  <joybro@company100.net>
+
+        AnimationBase asserts if a test tries to pause during the delay phase
+        https://bugs.webkit.org/show_bug.cgi?id=59475
+
+        Reviewed by Simon Fraser.
+
+        There is no more assertion failure after r90765, but the testcase still fails due to
+        the miscalculation of the pauseTime. This patch pauses the animation at its startTime
+        if a test tries to pause it during the delay phase.
+
+        * transitions/transition-in-delay-phase-expected.txt: Added.
+        * transitions/transition-in-delay-phase.html: Added.
+
 2011-07-18  Stephen White  <senorblanco@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Young Han Lee  <joybro@company100.net>
+
+        AnimationBase asserts if a test tries to pause during the delay phase
+        https://bugs.webkit.org/show_bug.cgi?id=59475
+
+        Reviewed by Simon Fraser.
+
+        There is no more assertion failure after r90765, but the testcase still fails due to
+        the miscalculation of the pauseTime. This patch pauses the animation at its startTime
+        if a test tries to pause it during the delay phase.
+
+        Test: transitions/transition-in-delay-phase.html
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::freezeAtTime):
+
 2011-07-18  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/page/animation/AnimationBase.cpp

@@ -1450 +1450 @@
 
     ASSERT(m_startTime);        // if m_startTime is zero, we haven't started yet, so we'll get a bad pause time.
-    m_pauseTime = m_startTime + t - m_animation->delay();
+    if (t <= m_animation->delay())
+        m_pauseTime = m_startTime;
+    else
+        m_pauseTime = m_startTime + t - m_animation->delay();
 
 #if USE(ACCELERATED_COMPOSITING)