Title: [219774] branches/safari-604-branch

Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (219773 => 219774)


--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-23 06:50:52 UTC (rev 219773)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-23 06:50:56 UTC (rev 219774)
@@ -1,3 +1,22 @@
+2017-07-22  Jason Marcell  <[email protected]>
+
+        Cherry-pick r219625. rdar://problem/33465689
+
+    2017-07-18  Antoine Quint  <[email protected]>
+
+            [macOS] Mouse pointer does not hide during fullscreen playback
+            https://bugs.webkit.org/show_bug.cgi?id=174638
+            <rdar://problem/33244399>
+
+            Reviewed by Dean Jackson.
+
+            Add a test that checks that the "-webkit-cursor-visibility" is set to "auto-hide" when
+            in fullscreen for the media controls container.
+
+            * media/modern-media-controls/css/webkit-cursor-visibility-auto-hide-expected.txt: Added.
+            * media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html: Added.
+            * platform/ios-simulator/TestExpectations:
+
 2017-07-17  Antoine Quint  <[email protected]>
 
         REGRESSION: order of AirPlay and volume controls is inconsistent between <audio> and <video>

Added: branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide-expected.txt (0 => 219774)


--- branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide-expected.txt	                        (rev 0)
+++ branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide-expected.txt	2017-07-23 06:50:56 UTC (rev 219774)
@@ -0,0 +1,15 @@
+Testing that control are shown in fullscreen when the controls attribute is not present.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.webkitDisplayingFullscreen is false
+PASS getComputedStyle(window.internals.shadowRoot(media).querySelector('.media-controls-container')).webkitCursorVisibility is "auto"
+
+PASS media.webkitDisplayingFullscreen is true
+PASS getComputedStyle(window.internals.shadowRoot(media).querySelector('.media-controls-container')).webkitCursorVisibility is "auto-hide"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html (0 => 219774)


--- branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html	                        (rev 0)
+++ branches/safari-604-branch/LayoutTests/media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html	2017-07-23 06:50:56 UTC (rev 219774)
@@ -0,0 +1,37 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" autoplay controls></video>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing that control are shown in fullscreen when the controls attribute is not present.");
+
+const media = document.querySelector("video");
+
+media.addEventListener("play", () => {
+
+    shouldBeFalse("media.webkitDisplayingFullscreen");
+    shouldBeEqualToString("getComputedStyle(window.internals.shadowRoot(media).querySelector('.media-controls-container')).webkitCursorVisibility", "auto");
+    debug("");
+
+    media.addEventListener("webkitfullscreenchange", () => {
+        shouldBeTrue("media.webkitDisplayingFullscreen");
+        shouldBeEqualToString("getComputedStyle(window.internals.shadowRoot(media).querySelector('.media-controls-container')).webkitCursorVisibility", "auto-hide");
+        debug("");
+        button.remove();
+        media.remove();
+        finishJSTest();
+    });
+
+    const button = document.body.appendChild(document.createElement("div"));
+    button.setAttribute("style", "position: absolute; left: 0; top: 0;");
+    button.innerText = "Enter fullscreen";
+    button.addEventListener("click", () => media.webkitEnterFullscreen());
+    pressOnElement(button);
+});
+
+</script>
+<script src=""
+</body>

Modified: branches/safari-604-branch/LayoutTests/platform/ios-simulator/TestExpectations (219773 => 219774)


--- branches/safari-604-branch/LayoutTests/platform/ios-simulator/TestExpectations	2017-07-23 06:50:52 UTC (rev 219773)
+++ branches/safari-604-branch/LayoutTests/platform/ios-simulator/TestExpectations	2017-07-23 06:50:56 UTC (rev 219774)
@@ -117,6 +117,7 @@
 # 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 ]
 media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html [ Skip ]
+media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html [ Skip ]
 media/modern-media-controls/placard-support/placard-support-airplay-fullscreen.html [ Skip ]
 
 # These tests specifically test iOS-only media controls features

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (219773 => 219774)


--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-23 06:50:52 UTC (rev 219773)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-23 06:50:56 UTC (rev 219774)
@@ -1,5 +1,27 @@
 2017-07-22  Jason Marcell  <[email protected]>
 
+        Cherry-pick r219625. rdar://problem/33465689
+
+    2017-07-18  Antoine Quint  <[email protected]>
+
+            [macOS] Mouse pointer does not hide during fullscreen playback
+            https://bugs.webkit.org/show_bug.cgi?id=174638
+            <rdar://problem/33244399>
+
+            Reviewed by Dean Jackson.
+
+            Test: media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html
+
+            The user-agent stylesheet sets the "-webkit-cursor-visibility" to "auto-hide" for fullscreen <video>
+            elements. Since we reset the page styles, including UA styles, on .media-controls-container, we need
+            to explicitly inherit this style property from the page to ensure the mouse pointer automatically
+            hides in fullscreen.
+
+            * Modules/modern-media-controls/controls/media-controls.css:
+            (.media-controls-container):
+
+2017-07-22  Jason Marcell  <[email protected]>
+
         Cherry-pick r219621. rdar://problem/33465059
 
     2017-07-18  Antoine Quint  <[email protected]>

Modified: branches/safari-604-branch/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (219773 => 219774)


--- branches/safari-604-branch/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css	2017-07-23 06:50:52 UTC (rev 219773)
+++ branches/safari-604-branch/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css	2017-07-23 06:50:56 UTC (rev 219774)
@@ -54,6 +54,7 @@
     all: initial;
     display: block;
     visibility: inherit;
+    -webkit-cursor-visibility: inherit;
     position: relative;
     will-change: z-index;
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to