Changeset 164318 in webkit

Timestamp:

Feb 18, 2014, 2:24:29 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

Do not cache media time until media engine returns a non-zero value
​https://bugs.webkit.org/show_bug.cgi?id=128976

Reviewed by Jer Noble.

No new tests, covered by existing tests.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::refreshCachedTime): Don't mark the cached time as valid

until it is non-zero.

(WebCore::HTMLMediaElement::currentTime): Return 0 if m_cachedTime is invalid.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-18  Eric Carlson  <eric.carlson@apple.com>
+
+        Do not cache media time until media engine returns a non-zero value
+        https://bugs.webkit.org/show_bug.cgi?id=128976
+
+        Reviewed by Jer Noble.
+
+        No new tests, covered by existing tests.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::refreshCachedTime): Don't mark the cached time as valid
+            until it is non-zero.
+        (WebCore::HTMLMediaElement::currentTime): Return 0 if m_cachedTime is invalid.
+
 2014-02-17  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2440 +2440 @@
 {
     m_cachedTime = m_player->currentTime();
+    if (!m_cachedTime) { 
+        // Do not use m_cachedTime until the media engine returns a non-zero value because we can't 
+        // estimate current time until playback actually begins. 
+        invalidateCachedTime(); 
+        return; 
+    } 
+
+    LOG(Media, "HTMLMediaElement::refreshCachedTime - caching time %f", m_cachedTime); 
     m_clockTimeAtLastCachedTimeUpdate = monotonicallyIncreasingTime();
 }
 
-void HTMLMediaElement::invalidateCachedTime()
+void HTMLMediaElement::invalidateCachedTime() const
 {
     LOG(Media, "HTMLMediaElement::invalidateCachedTime");
@@ -2510 +2518 @@
     refreshCachedTime();
 
+    if (m_cachedTime == MediaPlayer::invalidTime())
+        return 0;
+    
     return m_cachedTime;
 }

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -654 +654 @@
 
     void setShouldDelayLoadEvent(bool);
-    void invalidateCachedTime();
+    void invalidateCachedTime() const;
     void refreshCachedTime() const;