Changeset 271407 in webkit

Timestamp:

Jan 12, 2021 10:57:33 AM (3 years ago)

Author:

Peng Liu

Message:

REGRESSION (r271341): media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html is timing out
​https://bugs.webkit.org/show_bug.cgi?id=220530

Reviewed by Eric Carlson.

Similar to r271377, this patch fixes a layout test failure/timeout by enabling "MockVideoPresentationMode"
and sending a request to enter/exit fullscreen after the current mode change is completed.

• media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt:
• media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html:
• platform/mac/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt (modified) (2 diffs)
• media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html (modified) (5 diffs)
• platform/mac/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-12  Peng Liu  <peng.liu6@apple.com>
+
+        REGRESSION (r271341): media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=220530
+
+        Reviewed by Eric Carlson.
+
+        Similar to r271377, this patch fixes a layout test failure/timeout by enabling "MockVideoPresentationMode"
+        and sending a request to enter/exit fullscreen after the current mode change is completed.
+
+        * media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt:
+        * media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html:
+        * platform/mac/TestExpectations:
+
 2021-01-12  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt

@@ -8 +8 @@
 PASS shadowRoot.querySelector('.media-controls').classList.contains('inline') is true
 
+PASS internals.isChangingPresentationMode(media) became false
 Media entered fullscreen.
 PASS shadowRoot.querySelector('.media-controls').classList.contains('fullscreen') is true
@@ -13 +14 @@
 We exit fullscreen by clicking on the matching button.
 
+PASS internals.isChangingPresentationMode(media) became false
 Media exited fullscreen.
 PASS shadowRoot.querySelector('.media-controls').classList.contains('inline') is true

trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html

@@ -10 +10 @@
 description("Testing that entering fullscreen then going back into inline presents inline controls.");
 
+if (window.internals)
+    internals.setMockVideoPresentationModeEnabled(true);
+
 const media = document.querySelector("video");
 const shadowRoot = window.internals.shadowRoot(media);
@@ -19 +22 @@
 
     media.pause();
-    window.requestAnimationFrame(() => toggleFullscreen());
+    window.requestAnimationFrame(() => clickFullscreenButton());
 });
 
@@ -25 +28 @@
     debug("");
 
+    if (window.internals)
+        shouldBecomeEqual("internals.isChangingPresentationMode(media)", "false", toggleFullscreen);
+    else
+        toggleFullscreen();
+});
+
+function toggleFullscreen()
+{
     if (media.webkitDisplayingFullscreen) {
         debug("Media entered fullscreen.");
@@ -32 +43 @@
             debug("");
             debug("We exit fullscreen by clicking on the matching button.");
-            toggleFullscreen();
+            clickFullscreenButton();
         });
     } else {
@@ -45 +56 @@
         });
     }
-});
+}
 
-function toggleFullscreen()
+function clickFullscreenButton()
 {
     const element = shadowRoot.querySelector("button.fullscreen");

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1455 +1455 @@
 webkit.org/b/183490 media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html [ Failure ]
 webkit.org/b/183490 media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html [ Failure ]
-webkit.org/b/183490 media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html [ Failure ]
 webkit.org/b/183490 media/modern-media-controls/start-support/start-support-fullscreen.html [ Failure ]