[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3c85ad023dbfa09bd46daaf0d71a517a527f28ed
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 08:19:40 2010 +0000

    2010-03-11  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GStreamer] progressTimer never stopped after EOS
            https://bugs.webkit.org/show_bug.cgi?id=36007
    
            Mark the pipeline as paused only if playback hasn't ended
            yet. When didEnd() is triggered, the pipeline is paused (but
            paused() still returns false) and a timeupdate event is fired,
            those 2 conditions allow the HTMLMediaElement to stop the
            progressTimer (in updatePlayerState, via mediaPlayerTimeChanged).
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::updateStates):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55987 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 115656c..ae87ec5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-11  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GStreamer] progressTimer never stopped after EOS
+        https://bugs.webkit.org/show_bug.cgi?id=36007
+
+        Mark the pipeline as paused only if playback hasn't ended
+        yet. When didEnd() is triggered, the pipeline is paused (but
+        paused() still returns false) and a timeupdate event is fired,
+        those 2 conditions allow the HTMLMediaElement to stop the
+        progressTimer (in updatePlayerState, via mediaPlayerTimeChanged).
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::updateStates):
+
 2010-03-14  Chang Shu  <chang.shu at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 2acf149..d07e43a 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -875,8 +875,9 @@ void MediaPlayerPrivate::updateStates()
                     LOG_VERBOSE(Media, "[Buffering] Restarting playback.");
                     gst_element_set_state(m_playBin, GST_STATE_PLAYING);
                 }
-            } else if (!m_buffering)
+            } else if (!m_buffering && (currentTime() < duration())) {
                 m_paused = true;
+            }
         } else if (state == GST_STATE_PLAYING) {
             m_readyState = MediaPlayer::HaveEnoughData;
             m_paused = false;

-- 
WebKit Debian packaging