[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.2 branch:
commit 64be50ec88366b4739ace3c463340e39e3ca347b
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 24 23:02:07 2010 +0000

    2010-03-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Eric Carlson.
    
            [GStreamer] Fails to go to Loaded state because of floating point discrepancies
            https://bugs.webkit.org/show_bug.cgi?id=35891
    
            Use the m_fillStatus variable, which is more reliable, instead of
            using the calculation, for the completed case.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::fillTimerFired):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d32382..ab20af7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Eric Carlson.
+
+        [GStreamer] Fails to go to Loaded state because of floating point discrepancies
+        https://bugs.webkit.org/show_bug.cgi?id=35891
+
+        Use the m_fillStatus variable, which is more reliable, instead of
+        using the calculation, for the completed case.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::fillTimerFired):
+
 2010-03-23  Chris Evans  <cevans at chromium.org>
 
         Reviewed by Darin Adler.
@@ -3266,7 +3279,7 @@
 
         * GNUmakefile.am:
 
-2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Dirk Schulze.
 
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 93986da..7702219 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -734,7 +734,10 @@ void MediaPlayerPrivate::fillTimerFired(Timer<MediaPlayerPrivate>*)
     // Update maxTimeLoaded only if the media duration is
     // available. Otherwise we can't compute it.
     if (m_mediaDuration) {
-        m_maxTimeLoaded = static_cast<float>((fillStatus * m_mediaDuration) / 100.0);
+        if (fillStatus == 100.0)
+            m_maxTimeLoaded = m_mediaDuration;
+        else
+            m_maxTimeLoaded = static_cast<float>((fillStatus * m_mediaDuration) / 100.0);
         LOG_VERBOSE(Media, "[Buffering] Updated maxTimeLoaded: %f", m_maxTimeLoaded);
     }
 

-- 
WebKit Debian packaging