Title: [225204] trunk
- Revision
- 225204
- Author
- [email protected]
- Date
- 2017-11-27 16:22:52 -0800 (Mon, 27 Nov 2017)
Log Message
Unreviewed, rolling out r225201.
This caused multiple tests to timeout consistently.
Reverted changeset:
"Pressing the space bar while watching a fullscreen video
doesn't play or pause"
https://bugs.webkit.org/show_bug.cgi?id=180033
https://trac.webkit.org/changeset/225201
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (225203 => 225204)
--- trunk/LayoutTests/ChangeLog 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/LayoutTests/ChangeLog 2017-11-28 00:22:52 UTC (rev 225204)
@@ -1,3 +1,16 @@
+2017-11-27 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r225201.
+
+ This caused multiple tests to timeout consistently.
+
+ Reverted changeset:
+
+ "Pressing the space bar while watching a fullscreen video
+ doesn't play or pause"
+ https://bugs.webkit.org/show_bug.cgi?id=180033
+ https://trac.webkit.org/changeset/225201
+
2017-11-27 Antoine Quint <[email protected]>
Pressing the space bar while watching a fullscreen video doesn't play or pause
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback-expected.txt (225203 => 225204)
--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback-expected.txt 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback-expected.txt 2017-11-28 00:22:52 UTC (rev 225204)
@@ -1,26 +0,0 @@
-Testing media is paused and resumed when pressing the space bar in fullscreen.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Obtained a 'play' event.
-
-Entering fullscreen.
-
-Obtained a 'webkitfullscreenchange' event.
-PASS media.webkitDisplayingFullscreen is true
-PASS media.paused is false
-
-Pressing the space bar.
-
-Obtained a 'pause' event.
-
-Pressing the space bar.
-
-Obtained a 'play' event.
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback.html (225203 => 225204)
--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback.html 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback.html 2017-11-28 00:22:52 UTC (rev 225204)
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<body>
-<video src="" style="width: 320px; height: 240px;" controls autoplay></video>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing media is paused and resumed when pressing the space bar in fullscreen.");
-
-const media = document.querySelector("video");
-const button = document.body.appendChild(document.createElement("button"));
-button.textContent = "Enter Fullscreen";
-
-media.addEventListener("webkitfullscreenchange", () => {
- debug("");
- debug("Obtained a 'webkitfullscreenchange' event.");
- shouldBeTrue("media.webkitDisplayingFullscreen");
- shouldBeFalse("media.paused");
-
- // Test pressing the space bar while the media is playing.
- pressSpace();
-});
-
-let playCount = 0;
-media.addEventListener("play", () => {
- playCount++;
-
- debug("");
- debug("Obtained a 'play' event.");
-
- // Starting point.
- if (playCount == 1)
- enterFullscreen();
- else {
- debug("");
- button.remove();
- media.remove();
- finishJSTest();
- }
-});
-
-media.addEventListener("pause", () => {
- debug("");
- debug("Obtained a 'pause' event.");
-
- // Test pressing the space bar while the media is paused.
- pressSpace();
-});
-
-
-function enterFullscreen() {
- debug("");
- debug("Entering fullscreen.");
- button.addEventListener("click", () => {
- try {
- media.webkitEnterFullscreen();
- } catch(e) {
- debug("Toggling fullscreen failed");
- finishJSTest();
- }
- });
-
- pressOnElement(button);
-}
-
-function pressSpace()
-{
- debug("");
- debug("Pressing the space bar.");
- eventSender.keyDown(" ");
-}
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (225203 => 225204)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-11-28 00:22:52 UTC (rev 225204)
@@ -127,7 +127,6 @@
media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html [ Skip ]
media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause.html [ Skip ]
media/modern-media-controls/media-controller/media-controller-click-on-video-background-to-dismiss-tracks-panel-should-not-toggle-playback.html [ Skip ]
-media/modern-media-controls/media-controller/media-controller-space-bar-toggle-playback.html [ Skip ]
media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html [ Skip ]
media/modern-media-controls/media-documents/media-document-video-mac-sizing.html [ Skip ]
media/modern-media-controls/playback-support/playback-support-button-click.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (225203 => 225204)
--- trunk/Source/WebCore/ChangeLog 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/Source/WebCore/ChangeLog 2017-11-28 00:22:52 UTC (rev 225204)
@@ -1,3 +1,16 @@
+2017-11-27 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r225201.
+
+ This caused multiple tests to timeout consistently.
+
+ Reverted changeset:
+
+ "Pressing the space bar while watching a fullscreen video
+ doesn't play or pause"
+ https://bugs.webkit.org/show_bug.cgi?id=180033
+ https://trac.webkit.org/changeset/225201
+
2017-11-27 Chris Dumez <[email protected]>
NavigatorBase::serviceWorker() should return a reference instead of a raw pointer
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (225203 => 225204)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-11-28 00:22:14 UTC (rev 225203)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-11-28 00:22:52 UTC (rev 225204)
@@ -57,8 +57,6 @@
media.videoTracks.addEventListener("removetrack", this);
media.addEventListener(this.fullscreenChangeEventType, this);
-
- window.addEventListener("keydown", this);
}
// Public
@@ -102,7 +100,7 @@
togglePlayback()
{
if (this.media.paused)
- this.media.play().catch(e => {});
+ this.media.play();
else
this.media.pause();
}
@@ -160,9 +158,6 @@
this._updateControlsIfNeeded();
if (event.type === "webkitpresentationmodechanged")
this._returnMediaLayerToInlineIfNeeded();
- } else if (event.type === "keydown" && this.isFullscreen && event.key === " ") {
- this.togglePlayback();
- event.preventDefault();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
