Changeset 261342 in webkit

Timestamp:

May 7, 2020 4:08:44 PM (4 years ago)

Author:

eric.carlson@apple.com

Message:

[macOS] Playhead in Touch Bar continues when loading stalls
​https://bugs.webkit.org/show_bug.cgi?id=211585
<rdar://problem/33893306>

Reviewed by Darin Adler.

• platform/cocoa/PlaybackSessionModelMediaElement.h:
• platform/cocoa/PlaybackSessionModelMediaElement.mm:

(WebCore::PlaybackSessionModelMediaElement::updateForEventName): Listen for waitingEvent
and canplay events. Don't claim to be playing when stalled.
(WebCore::PlaybackSessionModelMediaElement::isStalled const): New.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cocoa/PlaybackSessionModelMediaElement.h (modified) (1 diff)
• platform/cocoa/PlaybackSessionModelMediaElement.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-07  Eric Carlson  <eric.carlson@apple.com>
+
+        [macOS] Playhead in Touch Bar continues when loading stalls
+        https://bugs.webkit.org/show_bug.cgi?id=211585
+        <rdar://problem/33893306>
+
+        Reviewed by Darin Adler.
+
+        * platform/cocoa/PlaybackSessionModelMediaElement.h:
+        * platform/cocoa/PlaybackSessionModelMediaElement.mm:
+        (WebCore::PlaybackSessionModelMediaElement::updateForEventName): Listen for `waitingEvent`
+        and `canplay` events. Don't claim to be playing when stalled.
+        (WebCore::PlaybackSessionModelMediaElement::isStalled const): New.
+
 2020-05-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h

@@ -104 +104 @@
     static const Vector<WTF::AtomString>& observedEventNames();
     const WTF::AtomString& eventNameAll();
+    bool isStalled() const;
 
     RefPtr<HTMLMediaElement> m_mediaElement;

trunk/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm

@@ -141 +141 @@
         || eventName == eventNames().pauseEvent
         || eventName == eventNames().playEvent
-        || eventName == eventNames().ratechangeEvent) {
-        bool isPlaying = this->isPlaying();
+        || eventName == eventNames().ratechangeEvent
+        || eventName == eventNames().waitingEvent
+        || eventName == eventNames().canplayEvent) {
+        bool isPlaying = this->isPlaying() && !isStalled();
         float playbackRate = this->playbackRate();
         for (auto client : m_clients)
@@ -430 +432 @@
 }
 
+bool PlaybackSessionModelMediaElement::isStalled() const
+{
+    return m_mediaElement && m_mediaElement->readyState() <= HTMLMediaElement::HAVE_CURRENT_DATA;
+}
+
 float PlaybackSessionModelMediaElement::playbackRate() const
 {