[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 71db42f474451801c2df82fd14bb5008a40ed20a
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 20:31:35 2010 +0000

    2010-11-11  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Eric Seidel.
    
            video-pause-immediately.html sometimes fails
            https://bugs.webkit.org/show_bug.cgi?id=49397
    
            * html/HTMLMediaElement.cpp:
            (WebCore::HTMLMediaElement::playInternal): Don't bother calling invalidateCachedTime, it
            will be called from updatePlayState.
            (WebCore::HTMLMediaElement::pauseInternal): Don't bother calling refreshCachedTime, it
            will be called from updatePlayState.
            (WebCore::HTMLMediaElement::updatePlayState): Call refreshCachedTime after telling the media
            engine to pause so we cache the post-paused time.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71842 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d7fa70..40d8c80 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-11  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        video-pause-immediately.html sometimes fails
+        https://bugs.webkit.org/show_bug.cgi?id=49397
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::playInternal): Don't bother calling invalidateCachedTime, it
+        will be called from updatePlayState.
+        (WebCore::HTMLMediaElement::pauseInternal): Don't bother calling refreshCachedTime, it
+        will be called from updatePlayState.
+        (WebCore::HTMLMediaElement::updatePlayState): Call refreshCachedTime after telling the media
+        engine to pause so we cache the post-paused time.
+
 2010-11-11  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed rollout. 
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index b230673..af14e6a 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -1439,7 +1439,6 @@ void HTMLMediaElement::playInternal()
     setPlaybackRate(defaultPlaybackRate());
     
     if (m_paused) {
-        invalidateCachedTime();
         m_paused = false;
         scheduleEvent(eventNames().playEvent);
 
@@ -1475,7 +1474,6 @@ void HTMLMediaElement::pauseInternal()
     m_autoplaying = false;
     
     if (!m_paused) {
-        refreshCachedTime();
         m_paused = true;
         scheduleTimeupdateEvent(false);
         scheduleEvent(eventNames().pauseEvent);
@@ -2120,9 +2118,9 @@ void HTMLMediaElement::updatePlayState()
         return;
 
     if (m_pausedInternal) {
-        refreshCachedTime();
         if (!m_player->paused())
             m_player->pause();
+        refreshCachedTime();
         m_playbackProgressTimer.stop();
         return;
     }
@@ -2148,9 +2146,9 @@ void HTMLMediaElement::updatePlayState()
         m_playing = true;
 
     } else { // Should not be playing right now
-        refreshCachedTime();
         if (!playerPaused)
             m_player->pause();
+        refreshCachedTime();
 
         m_playbackProgressTimer.stop();
         m_playing = false;

-- 
WebKit Debian packaging