Diff
Modified: trunk/LayoutTests/ChangeLog (213012 => 213013)
--- trunk/LayoutTests/ChangeLog 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/LayoutTests/ChangeLog 2017-02-26 23:40:54 UTC (rev 213013)
@@ -1,3 +1,17 @@
+2017-02-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r212942.
+ https://bugs.webkit.org/show_bug.cgi?id=168882
+
+ Made EWS very flaky (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[Modern Media Controls] Dragging controls in fullscreen on
+ macOS prevents scrubbing or interacting with controls"
+ https://bugs.webkit.org/show_bug.cgi?id=168820
+ http://trac.webkit.org/changeset/212942
+
2017-02-25 Zalan Bujtas <[email protected]>
Text might wrap when its preferred logical width is used for sizing the containing block.
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-expected.txt (213012 => 213013)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-expected.txt 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-expected.txt 2017-02-26 23:40:54 UTC (rev 213013)
@@ -1,10 +1,8 @@
-This test pauses the video, presses the fullscreen button, and drags the controls when the mouse is over a button. It should follow the mouse drag.
+Testing the MediaController resizing behavior.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS !!mediaControls.querySelector('.buttons-container.left') became true
-PASS mediaControls.querySelector('.buttons-container.left').style.width became "116px"
PASS mediaControls.querySelector('.controls-bar').style.transform is "translate(-50px, -100px)"
PASS successfullyParsed is true
Deleted: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button-expected.txt (213012 => 213013)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button-expected.txt 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button-expected.txt 2017-02-26 23:40:54 UTC (rev 213013)
@@ -1,12 +0,0 @@
-This test pauses the video, presses the fullscreen button, and drags the controls when the mouse is over a button. It should not move.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS !!mediaControls.querySelector('.buttons-container.left') became true
-PASS mediaControls.querySelector('.buttons-container.left').style.width became "116px"
-PASS mediaControls.querySelector('.controls-bar').style.transform is ""
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html (213012 => 213013)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html 2017-02-26 23:40:54 UTC (rev 213013)
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<body>
-<video src="" style="width: 320px; height: 240px;" controls autoplay></video>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("This test pauses the video, presses the fullscreen button, and drags the controls when the mouse is over a button. It should not move.");
-
-const media = document.querySelector("video");
-const shadowRoot = window.internals.shadowRoot(media);
-let mediaControls = shadowRoot.lastChild;
-
-media.addEventListener("webkitbeginfullscreen", () => {
- debug("webkitbeginfullscreen");
-});
-
-media.addEventListener("webkitfullscreenchange", () => {
- if (media.webkitDisplayingFullscreen) {
- mediaControls = shadowRoot.lastChild;
- shouldBecomeEqual("!!mediaControls.querySelector('.buttons-container.left')", "true", () => {
- shouldBecomeEqualToString("mediaControls.querySelector('.buttons-container.left').style.width", "116px", () => {
- const bounds = mediaControls.querySelector(".controls-bar").getBoundingClientRect();
- eventSender.mouseMoveTo(bounds.left + 68, bounds.top + 10);
- eventSender.mouseDown();
- eventSender.mouseMoveTo(bounds.left + 18, bounds.top - 90);
- eventSender.mouseUp();
-
- window.requestAnimationFrame(() => {
- shouldBeEqualToString("mediaControls.querySelector('.controls-bar').style.transform", "");
- finishJSTest();
- });
- });
- });
- }
-});
-
-media.addEventListener("play", () => {
- media.pause();
-
- window.requestAnimationFrame(() => {
- const bounds = mediaControls.querySelector("button.fullscreen").getBoundingClientRect();
- eventSender.mouseMoveTo(bounds.left + 1, bounds.top + 1);
- eventSender.mouseDown();
- eventSender.mouseUp();
- });
-});
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html (213012 => 213013)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html 2017-02-26 23:40:54 UTC (rev 213013)
@@ -6,7 +6,7 @@
window.jsTestIsAsync = true;
-description("This test pauses the video, presses the fullscreen button, and drags the controls when the mouse is over a button. It should follow the mouse drag.");
+description("Testing the <code>MediaController</code> resizing behavior.");
const media = document.querySelector("video");
const shadowRoot = window.internals.shadowRoot(media);
@@ -19,18 +19,16 @@
media.addEventListener("webkitfullscreenchange", () => {
if (media.webkitDisplayingFullscreen) {
mediaControls = shadowRoot.lastChild;
- shouldBecomeEqual("!!mediaControls.querySelector('.buttons-container.left')", "true", () => {
- shouldBecomeEqualToString("mediaControls.querySelector('.buttons-container.left').style.width", "116px", () => {
- const bounds = mediaControls.querySelector(".controls-bar").getBoundingClientRect();
- eventSender.mouseMoveTo(bounds.left + 118, bounds.top + 10);
- eventSender.mouseDown();
- eventSender.mouseMoveTo(bounds.left + 68, bounds.top - 90);
- eventSender.mouseUp();
+ window.requestAnimationFrame(() => {
+ const bounds = mediaControls.querySelector(".controls-bar").getBoundingClientRect();
+ eventSender.mouseMoveTo(bounds.left + 118, bounds.top + 10);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(bounds.left + 68, bounds.top - 90);
+ eventSender.mouseUp();
- window.requestAnimationFrame(() => {
- shouldBeEqualToString("mediaControls.querySelector('.controls-bar').style.transform", "translate(-50px, -100px)");
- finishJSTest();
- });
+ window.requestAnimationFrame(() => {
+ shouldBeEqualToString("mediaControls.querySelector('.controls-bar').style.transform", "translate(-50px, -100px)");
+ finishJSTest();
});
});
}
Modified: trunk/Source/WebCore/ChangeLog (213012 => 213013)
--- trunk/Source/WebCore/ChangeLog 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/Source/WebCore/ChangeLog 2017-02-26 23:40:54 UTC (rev 213013)
@@ -1,3 +1,17 @@
+2017-02-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r212942.
+ https://bugs.webkit.org/show_bug.cgi?id=168882
+
+ Made EWS very flaky (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[Modern Media Controls] Dragging controls in fullscreen on
+ macOS prevents scrubbing or interacting with controls"
+ https://bugs.webkit.org/show_bug.cgi?id=168820
+ http://trac.webkit.org/changeset/212942
+
2017-02-26 Chris Dumez <[email protected]>
HitTestResult's linkSuggestedFilename should sanitize download attribute
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js (213012 => 213013)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-26 23:06:54 UTC (rev 213012)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-26 23:40:54 UTC (rev 213013)
@@ -125,9 +125,6 @@
_handleMousedown(event)
{
- if (event.target !== this.controlsBar.element)
- return;
-
event.preventDefault();
event.stopPropagation();
