- Revision
- 218231
- Author
- [email protected]
- Date
- 2017-06-13 18:03:31 -0700 (Tue, 13 Jun 2017)
Log Message
Rebaseline media/modern-media-controls/fullscreen-support
https://bugs.webkit.org/show_bug.cgi?id=173199
Reviewed by Simon Fraser.
Source/WebCore:
Test: media/modern-media-controls/fullscreen-support/fullscreen-support-press.html
We no longer need to track the "error" event for FullscreenSupport since we don't actually
enable or disable the fullscreen button when an error happens, instead the media controls
code will simply not present it since we'll be showing a placard instead.
* Modules/modern-media-controls/media/fullscreen-support.js:
(FullscreenSupport.prototype.get mediaEvents):
LayoutTests:
We no longer need to test the "error" event for FullscreenSupport since we don't actually
enable or disable the fullscreen button when an error happens, instead the media controls
code will simply not present it since we'll be showing a placard instead.
We also remove the iPad-specific test since the fullscreen button is now accessible on an
iPhone as well, so it no longer needs a special iPad test.
* media/modern-media-controls/fullscreen-support/fullscreen-support-enabled-expected.txt:
* media/modern-media-controls/fullscreen-support/fullscreen-support-enabled.html:
* media/modern-media-controls/fullscreen-support/fullscreen-support-press-expected.txt: Renamed from LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt.
* media/modern-media-controls/fullscreen-support/fullscreen-support-press.html: Renamed from LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html.
* media/modern-media-controls/fullscreen-support/ipad/fullscreen-support-tap-expected.txt: Removed.
* media/modern-media-controls/fullscreen-support/ipad/fullscreen-support-tap.html: Removed.
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (218230 => 218231)
--- trunk/LayoutTests/ChangeLog 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/ChangeLog 2017-06-14 01:03:31 UTC (rev 218231)
@@ -1,3 +1,26 @@
+2017-06-11 Antoine Quint <[email protected]>
+
+ Rebaseline media/modern-media-controls/fullscreen-support
+ https://bugs.webkit.org/show_bug.cgi?id=173199
+
+ Reviewed by Simon Fraser.
+
+ We no longer need to test the "error" event for FullscreenSupport since we don't actually
+ enable or disable the fullscreen button when an error happens, instead the media controls
+ code will simply not present it since we'll be showing a placard instead.
+
+ We also remove the iPad-specific test since the fullscreen button is now accessible on an
+ iPhone as well, so it no longer needs a special iPad test.
+
+ * media/modern-media-controls/fullscreen-support/fullscreen-support-enabled-expected.txt:
+ * media/modern-media-controls/fullscreen-support/fullscreen-support-enabled.html:
+ * media/modern-media-controls/fullscreen-support/fullscreen-support-press-expected.txt: Renamed from LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt.
+ * media/modern-media-controls/fullscreen-support/fullscreen-support-press.html: Renamed from LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html.
+ * media/modern-media-controls/fullscreen-support/ipad/fullscreen-support-tap-expected.txt: Removed.
+ * media/modern-media-controls/fullscreen-support/ipad/fullscreen-support-tap.html: Removed.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
2017-06-13 Carlos Alberto Lopez Perez <[email protected]>
[GTK] Fix linter warnings on the GTK Debug TestExpectation file and update some expectations for Debug.
Deleted: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt (218230 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt 2017-06-14 01:03:31 UTC (rev 218231)
@@ -1,10 +0,0 @@
-Testing the FullscreenSupport behavior when clicking the fullscreen button.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS media.webkitDisplayingFullscreen is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html (218230 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html 2017-06-14 01:03:31 UTC (rev 218231)
@@ -1,50 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<body>
-<style type="text/css" media="screen">
-
- video, #host {
- position: absolute;
- top: 0;
- left: 0;
- width: 800px;
- height: 240px;
- }
-
-</style>
-<video src="" controls autoplay></video>
-<div id="host"></div>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing the <code>FullscreenSupport</code> behavior when clicking the fullscreen button.");
-
-const container = document.querySelector("div#host");
-const media = document.querySelector("video");
-const mediaController = createControls(container, media, null);
-
-scheduler.frameDidFire = function() {
- if (media.paused)
- return;
-
- const button = mediaController.controls.fullscreenButton.element;
- if (button.getBoundingClientRect().width === 0)
- return;
-
- media.pause();
- pressOnElement(button);
- scheduler.frameDidFire = null;
-};
-
-media.addEventListener("webkitfullscreenchange", () => {
- shouldBeTrue("media.webkitDisplayingFullscreen");
- container.remove();
- media.remove();
- finishMediaControlsTest();
-});
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled-expected.txt (218230 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled-expected.txt 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled-expected.txt 2017-06-14 01:03:31 UTC (rev 218231)
@@ -6,9 +6,6 @@
Once media loads and we have tracks in the video, the fullscreen button should become enabled
PASS mediaController.controls.fullscreenButton.enabled became true
-We now set the media source to be the empty string to force an error, which should disable the fullscreen button
-PASS mediaController.controls.fullscreenButton.enabled is false
-
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled.html (218230 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled.html 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-enabled.html 2017-06-14 01:03:31 UTC (rev 218231)
@@ -29,16 +29,10 @@
debug("Once media loads and we have tracks in the video, the fullscreen button should become enabled");
shouldBecomeEqual("mediaController.controls.fullscreenButton.enabled", "true", () => {
- media.addEventListener("error", () => {
- shouldBeFalse("mediaController.controls.fullscreenButton.enabled");
- debug("");
- container.remove();
- media.remove();
- finishJSTest();
- });
debug("");
- debug("We now set the media source to be the empty string to force an error, which should disable the fullscreen button");
- media.src = ""
+ container.remove();
+ media.remove();
+ finishJSTest();
});
</script>
Copied: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press-expected.txt (from rev 218230, trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click-expected.txt) (0 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press-expected.txt 2017-06-14 01:03:31 UTC (rev 218231)
@@ -0,0 +1,10 @@
+Testing the FullscreenSupport behavior when clicking the fullscreen button.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.webkitDisplayingFullscreen is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press.html (from rev 218230, trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html) (0 => 218231)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-press.html 2017-06-14 01:03:31 UTC (rev 218231)
@@ -0,0 +1,50 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<style type="text/css" media="screen">
+
+ video, #host {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 800px;
+ height: 240px;
+ }
+
+</style>
+<video src="" controls autoplay></video>
+<div id="host"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>FullscreenSupport</code> behavior when clicking the fullscreen button.");
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+
+scheduler.frameDidFire = function() {
+ if (media.paused)
+ return;
+
+ const button = mediaController.controls.fullscreenButton.element;
+ if (button.getBoundingClientRect().width === 0)
+ return;
+
+ media.pause();
+ pressOnElement(button);
+ scheduler.frameDidFire = null;
+};
+
+media.addEventListener(media.webkitPresentationMode ? "webkitpresentationmodechanged" : "webkitfullscreenchange", () => {
+ shouldBeTrue("media.webkitDisplayingFullscreen");
+ container.remove();
+ media.remove();
+ finishMediaControlsTest();
+});
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218230 => 218231)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:03:31 UTC (rev 218231)
@@ -75,6 +75,7 @@
media/modern-media-controls/controls-visibility-support [ Pass ]
media/modern-media-controls/forward-button [ Pass ]
media/modern-media-controls/fullscreen-button [ Pass ]
+media/modern-media-controls/fullscreen-support [ Pass ]
media/modern-media-controls/icon-service [ Pass ]
media/modern-media-controls/invalid-placard [ Pass ]
media/modern-media-controls/layout-item [ Pass ]
@@ -96,6 +97,7 @@
# These tests use touch events and don't work in OpenSource
media/modern-media-controls/button/button.html [ Skip ]
media/modern-media-controls/button/button-active-state.html [ Skip ]
+media/modern-media-controls/fullscreen-support/fullscreen-support-press.html [ Skip ]
# These tests rely on fullscreen which do not use the WebKit media controls on iOS
media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218230 => 218231)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:03:31 UTC (rev 218231)
@@ -1555,6 +1555,7 @@
media/modern-media-controls/controls-visibility-support [ Pass ]
media/modern-media-controls/forward-button [ Pass ]
media/modern-media-controls/fullscreen-button [ Pass ]
+media/modern-media-controls/fullscreen-support [ Pass ]
media/modern-media-controls/icon-service [ Pass ]
media/modern-media-controls/invalid-placard [ Pass ]
media/modern-media-controls/layout-item [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (218230 => 218231)
--- trunk/Source/WebCore/ChangeLog 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/Source/WebCore/ChangeLog 2017-06-14 01:03:31 UTC (rev 218231)
@@ -1,3 +1,19 @@
+2017-06-11 Antoine Quint <[email protected]>
+
+ Rebaseline media/modern-media-controls/fullscreen-support
+ https://bugs.webkit.org/show_bug.cgi?id=173199
+
+ Reviewed by Simon Fraser.
+
+ Test: media/modern-media-controls/fullscreen-support/fullscreen-support-press.html
+
+ We no longer need to track the "error" event for FullscreenSupport since we don't actually
+ enable or disable the fullscreen button when an error happens, instead the media controls
+ code will simply not present it since we'll be showing a placard instead.
+
+ * Modules/modern-media-controls/media/fullscreen-support.js:
+ (FullscreenSupport.prototype.get mediaEvents):
+
2017-06-13 Matt Rajca <[email protected]>
WebsitePolicies: let clients select specific autoplay quirks
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js (218230 => 218231)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2017-06-14 00:36:29 UTC (rev 218230)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2017-06-14 01:03:31 UTC (rev 218231)
@@ -35,7 +35,7 @@
get mediaEvents()
{
- return ["loadedmetadata", "error"];
+ return ["loadedmetadata"];
}
get tracksToMonitor()
