Changeset 58107 in webkit

Timestamp:

Apr 22, 2010 11:06:07 AM (14 years ago)

Author:

eric.carlson@apple.com

Message:

2010-04-22 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

Do not pause movie when readyState drops below HAVE_FUTURE_DATA
​https://bugs.webkit.org/show_bug.cgi?id=37991
<rdar://problem/7893937>

No new tests, we don't have infrastructure in DRT to test with streamed
movies.

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize m_readyStateMaximum. (WebCore::HTMLMediaElement::prepareForLoad): Reset m_readyStateMaximum. (WebCore::HTMLMediaElement::setReadyState): Maintain m_readyStateMaximum. (WebCore::HTMLMediaElement::potentiallyPlaying): Also return true if the readyState was previously >= HAVE_FUTURE_DATA.
• html/HTMLMediaElement.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-22  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Do not pause movie when readyState drops below HAVE_FUTURE_DATA
+        https://bugs.webkit.org/show_bug.cgi?id=37991
+        <rdar://problem/7893937>
+
+        No new tests, we don't have infrastructure in DRT to test with streamed
+        movies.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize m_readyStateMaximum.
+        (WebCore::HTMLMediaElement::prepareForLoad): Reset m_readyStateMaximum.
+        (WebCore::HTMLMediaElement::setReadyState): Maintain m_readyStateMaximum.
+        (WebCore::HTMLMediaElement::potentiallyPlaying): Also return true if the readyState was
+        previously >= HAVE_FUTURE_DATA. 
+        * html/HTMLMediaElement.h:
+
 2010-04-22  Zhenyao Mo  <zmo@google.com>
 

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -93 +93 @@
     , m_networkState(NETWORK_EMPTY)
     , m_readyState(HAVE_NOTHING)
+    , m_readyStateMaximum(HAVE_NOTHING)
     , m_volume(1.0f)
     , m_lastSeekTime(0)
@@ -494 +495 @@
         m_networkState = NETWORK_EMPTY;
         m_readyState = HAVE_NOTHING;
+        m_readyStateMaximum = HAVE_NOTHING;
         m_paused = true;
         m_seeking = false;
@@ -853 +855 @@
         return;
     
+    if (oldState > m_readyStateMaximum)
+        m_readyStateMaximum = oldState;
+
     if (m_networkState == NETWORK_EMPTY)
         return;
@@ -1629 +1634 @@
 bool HTMLMediaElement::potentiallyPlaying() const
 {
-    return m_readyState >= HAVE_FUTURE_DATA && couldPlayIfEnoughData();
+    // "pausedToBuffer" means the media engine's rate is 0, but only because it had to stop playing
+    // when it ran out of buffered data. A movie is this state is "potentially playing", modulo the
+    // checks in couldPlayIfEnoughData().
+    bool pausedToBuffer = m_readyStateMaximum >= HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA;
+    return (pausedToBuffer || m_readyState >= HAVE_FUTURE_DATA) && couldPlayIfEnoughData();
 }
 

trunk/WebCore/html/HTMLMediaElement.h

@@ -297 +297 @@
     NetworkState m_networkState;
     ReadyState m_readyState;
+    ReadyState m_readyStateMaximum;
     String m_currentSrc;