Commit c51b669d authored by jamesr@google.com's avatar jamesr@google.com

2011-01-07 James Robinson <jamesr@chromium.org>

        Fix compile bustage due to bad merge in 75276.

        * page/animation/AnimationController.cpp:
        (WebCore::AnimationControllerPrivate::beginAnimationUpdateTime):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d9d59ff9
2011-01-07 James Robinson <jamesr@chromium.org>
Fix compile bustage due to bad merge in 75276.
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::beginAnimationUpdateTime):
2010-12-17 Jer Noble <jer@kokode.apple.com>
Reviewed by Simon Fraser.
......
......@@ -316,7 +316,7 @@ bool AnimationControllerPrivate::pauseTransitionAtTime(RenderObject* renderer, c
double AnimationControllerPrivate::beginAnimationUpdateTime()
{
if (m_beginAnimationUpdateTime == cBeginAnimationUpdateTimeNotSet)
m_beginAnimationUpdateTime = m_frame->currentAnimationTime();
m_beginAnimationUpdateTime = currentTime();
return m_beginAnimationUpdateTime;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment