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

kov at webkit.org kov at webkit.org
Thu Apr 8 02:18:43 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit b2865545bc4bdbc0812cbfa0f381bf6a9b00a329
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 18:41:03 2010 +0000

    2010-03-10  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Rubber-stamped by Xan Lopez.
    
            Fix ready state when buffering under PLAYING. We should not go
            back to HaveNothing in that case.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::updateStates):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55788 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a52342..7790fc1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Rubber-stamped by Xan Lopez.
+
+        Fix ready state when buffering under PLAYING. We should not go
+        back to HaveNothing in that case.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::updateStates):
+
 2010-03-10  Ada Chan  <adachan at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index b46e29c..e683ee3 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -852,7 +852,7 @@ void MediaPlayerPrivate::updateStates()
             }
 
             if (m_buffering) {
-                m_readyState = MediaPlayer::HaveNothing;
+                m_readyState = MediaPlayer::HaveCurrentData;
                 m_networkState = MediaPlayer::Loading;
 
                 LOG_VERBOSE(Media, "[Buffering] Pausing stream for buffering.");

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list