2011-01-07 James Robinson <jamesr@chromium.org>
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Jan 2011 22:51:30 +0000 (22:51 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Jan 2011 22:51:30 +0000 (22:51 +0000)
        Fix compile bustage due to bad merge in 75276.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/animation/AnimationController.cpp

index 309e6af..1307a05 100644 (file)
@@ -1,3 +1,10 @@
+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.
index a4e0063..e1281dd 100644 (file)
@@ -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;
 }