[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit c51b669d7afb0738499152bd40f5632f0e124cb3
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 22:51:30 2011 +0000

    2011-01-07  James Robinson  <jamesr at 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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 309e6af..1307a05 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07  James Robinson  <jamesr at chromium.org>
+
+        Fix compile bustage due to bad merge in 75276.
+
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::beginAnimationUpdateTime):
+
 2010-12-17  Jer Noble  <jer at kokode.apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/page/animation/AnimationController.cpp b/WebCore/page/animation/AnimationController.cpp
index a4e0063..e1281dd 100644
--- a/WebCore/page/animation/AnimationController.cpp
+++ b/WebCore/page/animation/AnimationController.cpp
@@ -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;
 }
 

-- 
WebKit Debian packaging