[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5d34ed525a6c7094c5b1dcbce28ee9ba894842c1
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 16:42:41 2010 +0000

    2010-11-11  Eric Carlson  <eric.carlson at apple.com>
    
            Build fix after r71824.
    
            * html/HTMLMediaElement.cpp:
            (WebCore::HTMLMediaElement::invalidateCachedTime): Use an explicit cast from double to float.
            (WebCore::HTMLMediaElement::currentTime): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 35c84da..495623b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-11  Eric Carlson  <eric.carlson at apple.com>
 
+        Build fix after r71824.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::invalidateCachedTime): Use an explicit cast from double to float.
+        (WebCore::HTMLMediaElement::currentTime): Ditto.
+
+2010-11-11  Eric Carlson  <eric.carlson at apple.com>
+
         Reviewed by Antti Koivisto.
 
         Lots of time spent in MediaPlayerPrivate::currentTime() when playing multiple videos.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index fc3b31f..cf6aabf 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -1226,7 +1226,7 @@ void HTMLMediaElement::invalidateCachedTime()
     // too early.
     static const float minimumTimePlayingBeforeCacheSnapshot = 0.5;
 
-    m_minimumWallClockTimeToCacheMediaTime = WTF::currentTime() + minimumTimePlayingBeforeCacheSnapshot;
+    m_minimumWallClockTimeToCacheMediaTime = static_cast<float>(WTF::currentTime()) + minimumTimePlayingBeforeCacheSnapshot;
     m_cachedTime = invalidMediaTime;
 }
 
@@ -1263,7 +1263,7 @@ float HTMLMediaElement::currentTime() const
 
         // Not too soon, use the cached time only if it hasn't expired.
         if (wallClockDelta < maximumDurationToCacheMediaTime) {
-            float adjustedCacheTime = m_cachedTime + (m_playbackRate * wallClockDelta);
+            float adjustedCacheTime = static_cast<float>(m_cachedTime + (m_playbackRate * wallClockDelta));
 
 #if LOG_CACHED_TIME_WARNINGS
             float delta = adjustedCacheTime - m_player->currentTime();

-- 
WebKit Debian packaging