Changeset 271341 in webkit

Timestamp:

Jan 8, 2021 7:11:05 PM (19 months ago)

Author:

Peng Liu

Message:

A video element needs to ignore the request to enter/exit fullscreen before the current fullscreen mode change is completed
​https://bugs.webkit.org/show_bug.cgi?id=220466

Reviewed by Jer Noble.

Source/WebCore:

Fix a flaky layout test: media/media-fullscreen-inline.html

• html/HTMLVideoElement.cpp:

(WebCore::HTMLVideoElement::webkitEnterFullscreen):
(WebCore::HTMLVideoElement::webkitExitFullscreen):

LayoutTests:

• media/media-fullscreen-inline-expected.txt:
• media/media-fullscreen.js:

(async beginfullscreen):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-fullscreen-inline-expected.txt (modified) (1 diff)
• LayoutTests/media/media-fullscreen.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLVideoElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-08  Peng Liu  <peng.liu6@apple.com>
+
+        A video element needs to ignore the request to enter/exit fullscreen before the current fullscreen mode change is completed
+        https://bugs.webkit.org/show_bug.cgi?id=220466
+
+        Reviewed by Jer Noble.
+
+        * media/media-fullscreen-inline-expected.txt:
+        * media/media-fullscreen.js:
+        (async beginfullscreen):
+
 2021-01-08  Brady Eidson  <beidson@apple.com>
 

trunk/LayoutTests/media/media-fullscreen-inline-expected.txt

@@ -31 +31 @@
 RUN(mediaElement.webkitEnterFullScreen())
 EVENT(webkitfullscreenchange)
-EXPECTED (mediaElement.webkitDisplayingFullscreen == 'true') OK
+EXPECTED (internals.isChangingPresentationMode(mediaElement) == 'false') OK
 RUN(mediaElement.webkitExitFullScreen())
 EVENT(webkitfullscreenchange)

trunk/LayoutTests/media/media-fullscreen.js

@@ -41 +41 @@
 async function beginfullscreen()
 {
-    await testExpectedEventually("mediaElement.webkitDisplayingFullscreen", true);
+    if (window.internals)
+        await testExpectedEventually("internals.isChangingPresentationMode(mediaElement)", false);
     run("mediaElement.webkitExitFullScreen()");
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-08  Peng Liu  <peng.liu6@apple.com>
+
+        A video element needs to ignore the request to enter/exit fullscreen before the current fullscreen mode change is completed
+        https://bugs.webkit.org/show_bug.cgi?id=220466
+
+        Reviewed by Jer Noble.
+
+        Fix a flaky layout test: media/media-fullscreen-inline.html
+
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::webkitEnterFullscreen):
+        (WebCore::HTMLVideoElement::webkitExitFullscreen):
+
 2021-01-08  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/html/HTMLVideoElement.cpp

@@ -331 +331 @@
 
     // Generate an exception if this isn't called in response to a user gesture, or if the 
-    // element does not support fullscreen.
-    if (!mediaSession().fullscreenPermitted() || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard))
+    // element does not support fullscreen, or the element is changing fullscreen mode.
+    if (!mediaSession().fullscreenPermitted() || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard) || isChangingVideoFullscreenMode())
         return Exception { InvalidStateError };
 
@@ -342 +342 @@
 {
     ALWAYS_LOG(LOGIDENTIFIER);
-    if (isFullscreen())
+    if (isFullscreen() && !isChangingVideoFullscreenMode())
         exitFullscreen();
 }