Changeset 265145 in webkit

Timestamp:

Jul 31, 2020 10:09:04 AM (4 years ago)

Author:

Peng Liu

Message:

PIP on netflix.com shows only a gray window and spinner
​https://bugs.webkit.org/show_bug.cgi?id=214899

Reviewed by Jer Noble.

Use an empty "seekableRanges" instead of a special "duration" value (NaN) to indicate
that seeking is not supported. With this change, the "duration" will always have a meaningful
value, so that WebAVPlayerController can work properly in the picture-in-picture mode.
Related change: ​https://trac.webkit.org/changeset/217858.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::supportsSeeking const):

• platform/cocoa/PlaybackSessionModelMediaElement.mm:

(WebCore::PlaybackSessionModelMediaElement::duration const):
(WebCore::PlaybackSessionModelMediaElement::seekableRanges const):

• platform/mac/WebPlaybackControlsManager.mm:

(-[WebPlaybackControlsManager canBeginTouchBarScrubbing]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• platform/cocoa/PlaybackSessionModelMediaElement.mm (modified) (2 diffs)
• platform/mac/WebPlaybackControlsManager.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-31  Peng Liu  <peng.liu6@apple.com>
+
+        PIP on netflix.com shows only a gray window and spinner
+        https://bugs.webkit.org/show_bug.cgi?id=214899
+
+        Reviewed by Jer Noble.
+
+        Use an empty "seekableRanges" instead of a special "duration" value (NaN) to indicate
+        that seeking is not supported. With this change, the "duration" will always have a meaningful
+        value, so that WebAVPlayerController can work properly in the picture-in-picture mode.
+        Related change: https://trac.webkit.org/changeset/217858.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::supportsSeeking const):
+        * platform/cocoa/PlaybackSessionModelMediaElement.mm:
+        (WebCore::PlaybackSessionModelMediaElement::duration const):
+        (WebCore::PlaybackSessionModelMediaElement::seekableRanges const):
+        * platform/mac/WebPlaybackControlsManager.mm:
+        (-[WebPlaybackControlsManager canBeginTouchBarScrubbing]):
+
 2020-07-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -7497 +7497 @@
 bool HTMLMediaElement::supportsSeeking() const
 {
-    return !document().quirks().needsSeekingSupportDisabled() && !isLiveStream();
+    return !document().quirks().needsSeekingSupportDisabled();
 }
 

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

@@ -427 +427 @@
 double PlaybackSessionModelMediaElement::duration() const
 {
-    if (!m_mediaElement)
-        return 0;
-    return m_mediaElement->supportsSeeking() ? m_mediaElement->duration() : std::numeric_limits<double>::quiet_NaN();
+    return m_mediaElement ? m_mediaElement->duration() : 0;
 }
 
@@ -459 +457 @@
 Ref<TimeRanges> PlaybackSessionModelMediaElement::seekableRanges() const
 {
-    return m_mediaElement ? m_mediaElement->seekable() : TimeRanges::create();
+    return m_mediaElement && m_mediaElement->supportsSeeking() ? m_mediaElement->seekable() : TimeRanges::create();
 }
 

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm

@@ -120 +120 @@
     // other media. The intent of the API is that we return NO when the media is being scrubbed via the on-screen scrubber.
     // But we can only possibly get the right answer for media that uses the default controls.
-    return std::isfinite(_contentDuration);;
+    return std::isfinite(_contentDuration) && [_seekableTimeRanges count];
 }