Changeset 261576 in webkit

Timestamp:

May 12, 2020 1:43:58 PM (4 years ago)

Author:

eric.carlson@apple.com

Message:

Poster set after playback begins should be ignored
​https://bugs.webkit.org/show_bug.cgi?id=211464
<rdar://problem/62605114>

Reviewed by Darin Adler.

Source/WebCore:

Test: media/video-poster-set-after-playback.html

• html/HTMLVideoElement.cpp:

(WebCore::HTMLVideoElement::parseAttribute): Ignore poster changes after first video frame
is available.
(WebCore::HTMLVideoElement::updateDisplayState): Set mode to Video if the first video
frame is available.

• testing/Internals.cpp:

(WebCore::Internals::elementShouldDisplayPosterImage const):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• media/video-poster-set-after-playback-expected.txt: Added.
• media/video-poster-set-after-playback.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-poster-set-after-playback-expected.txt (added)
• LayoutTests/media/video-poster-set-after-playback.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLVideoElement.cpp (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+        Poster set after playback begins should be ignored
+        https://bugs.webkit.org/show_bug.cgi?id=211464
+        <rdar://problem/62605114>
+
+        Reviewed by Darin Adler.
+
+        * media/video-poster-set-after-playback-expected.txt: Added.
+        * media/video-poster-set-after-playback.html: Added.
+
 2020-05-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+        Poster set after playback begins should be ignored
+        https://bugs.webkit.org/show_bug.cgi?id=211464
+        <rdar://problem/62605114>
+
+        Reviewed by Darin Adler.
+
+        Test: media/video-poster-set-after-playback.html
+
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::parseAttribute): Ignore `poster` changes after first video frame
+        is available.
+        (WebCore::HTMLVideoElement::updateDisplayState): Set mode to Video if the first video
+        frame is available.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::elementShouldDisplayPosterImage const):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-05-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/html/HTMLVideoElement.cpp

@@ -133 +133 @@
 {
     if (name == posterAttr) {
+        if (hasAvailableVideoFrame())
+            return;
+
         // Force a poster recalc by setting m_displayMode to Unknown directly before calling updateDisplayState.
         HTMLMediaElement::setDisplayMode(Unknown);
@@ -162 +165 @@
 #endif
     }
-
 }
 
@@ -279 +281 @@
 void HTMLVideoElement::updateDisplayState()
 {
-    if (posterImageURL().isEmpty())
+    if (posterImageURL().isEmpty() || hasAvailableVideoFrame())
         setDisplayMode(Video);
     else if (displayMode() < Poster)

trunk/Source/WebCore/testing/Internals.cpp

@@ -4335 +4335 @@
 }
 
+ExceptionOr<bool> Internals::elementShouldDisplayPosterImage(HTMLVideoElement& element) const
+{
+#if ENABLE(VIDEO)
+    return element.shouldDisplayPosterImage();
+#else
+    UNUSED_PARAM(element);
+    return Exception { InvalidAccessError };
+#endif
+}
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)

trunk/Source/WebCore/testing/Internals.h

@@ -868 +868 @@
     ExceptionOr<MediaUsageState> mediaUsageState(HTMLMediaElement&) const;
 
+    ExceptionOr<bool> elementShouldDisplayPosterImage(HTMLVideoElement&) const;
+
 #if ENABLE(VIDEO)
     using PlaybackControlsPurpose = MediaElementSession::PlaybackControlsPurpose;

trunk/Source/WebCore/testing/Internals.idl

@@ -841 +841 @@
 
     [Conditional=VIDEO, MayThrowException] MediaUsageState mediaUsageState(HTMLMediaElement element);
+    [Conditional=VIDEO, MayThrowException] boolean elementShouldDisplayPosterImage(HTMLVideoElement element);
 
     DOMString ongoingLoadsDescriptions();