Title: [271832] branches/safari-611-branch/LayoutTests
- Revision
- 271832
- Author
- alanc...@apple.com
- Date
- 2021-01-25 14:11:46 -0800 (Mon, 25 Jan 2021)
Log Message
Cherry-pick r271407. rdar://problem/73477392
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271407 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/LayoutTests/ChangeLog (271831 => 271832)
--- branches/safari-611-branch/LayoutTests/ChangeLog 2021-01-25 22:11:44 UTC (rev 271831)
+++ branches/safari-611-branch/LayoutTests/ChangeLog 2021-01-25 22:11:46 UTC (rev 271832)
@@ -1,5 +1,37 @@
2021-01-25 Alan Coon <alanc...@apple.com>
+ Cherry-pick r271407. rdar://problem/73477392
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271407 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-01-12 Peng Liu <peng.l...@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-25 Alan Coon <alanc...@apple.com>
+
Cherry-pick r271543. rdar://problem/73469576
[iOS] Emoji keyboard covers text field on twitter.com/messages
Modified: branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt (271831 => 271832)
--- branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt 2021-01-25 22:11:44 UTC (rev 271831)
+++ branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt 2021-01-25 22:11:46 UTC (rev 271832)
@@ -7,11 +7,13 @@
Media started playing, we pause it and enter fullscreen by clicking on the matching button.
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
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
PASS shadowRoot.querySelector('.start-button') is null
Modified: branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html (271831 => 271832)
--- branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html 2021-01-25 22:11:44 UTC (rev 271831)
+++ branches/safari-611-branch/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html 2021-01-25 22:11:46 UTC (rev 271832)
@@ -9,6 +9,9 @@
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);
@@ -18,12 +21,20 @@
shouldBeTrue("shadowRoot.querySelector('.media-controls').classList.contains('inline')");
media.pause();
- window.requestAnimationFrame(() => toggleFullscreen());
+ window.requestAnimationFrame(() => clickFullscreenButton());
});
media.addEventListener("webkitfullscreenchange", () => {
debug("");
+ if (window.internals)
+ shouldBecomeEqual("internals.isChangingPresentationMode(media)", "false", toggleFullscreen);
+ else
+ toggleFullscreen();
+});
+
+function toggleFullscreen()
+{
if (media.webkitDisplayingFullscreen) {
debug("Media entered fullscreen.");
window.requestAnimationFrame(() => {
@@ -31,7 +42,7 @@
debug("");
debug("We exit fullscreen by clicking on the matching button.");
- toggleFullscreen();
+ clickFullscreenButton();
});
} else {
debug("Media exited fullscreen.");
@@ -44,9 +55,9 @@
finishJSTest();
});
}
-});
+}
-function toggleFullscreen()
+function clickFullscreenButton()
{
const element = shadowRoot.querySelector("button.fullscreen");
const bounds = element.getBoundingClientRect();
Modified: branches/safari-611-branch/LayoutTests/platform/mac/TestExpectations (271831 => 271832)
--- branches/safari-611-branch/LayoutTests/platform/mac/TestExpectations 2021-01-25 22:11:44 UTC (rev 271831)
+++ branches/safari-611-branch/LayoutTests/platform/mac/TestExpectations 2021-01-25 22:11:46 UTC (rev 271832)
@@ -1455,7 +1455,6 @@
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-fullscreen-change.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 ]
webkit.org/b/183764 fast/css/apple-system-control-colors.html [ Pass ]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
