Title: [208491] trunk
Revision
208491
Author
[email protected]
Date
2016-11-09 14:34:48 -0800 (Wed, 09 Nov 2016)

Log Message

[Modern Media Controls] Media Controller: set status label according to media state
https://bugs.webkit.org/show_bug.cgi?id=164557
<rdar://problem/29184097>

Patch by Antoine Quint <[email protected]> on 2016-11-09
Reviewed by Dean Jackson.

Source/WebCore:

Correctly set the StatusLabel text based on the media loading and network state.

Tests: http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html
       http/tests/media/modern-media-controls/status-support/status-support-loading.html
       media/modern-media-controls/status-support/status-support-error.html

* Modules/modern-media-controls/js-files:
* Modules/modern-media-controls/media/media-controller.js:
(MediaController):
* Modules/modern-media-controls/media/status-support.js: Added.
(StatusSupport.prototype.get control):
(StatusSupport.prototype.get mediaEvents):
(StatusSupport.prototype.syncControl):
(StatusSupport):
* WebCore.xcodeproj/project.pbxproj:

LayoutTests:

Add new tests to check that we display the expected StatusLabel text when the media is in the
"Loading", "Error" and "Live Broadcast" states.

* http/tests/media/modern-media-controls/status-support/status-support-live-broadcast-expected.txt: Added.
* http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html: Added.
* http/tests/media/modern-media-controls/status-support/status-support-loading-expected.txt: Added.
* http/tests/media/modern-media-controls/status-support/status-support-loading.html: Added.
* media/modern-media-controls/status-support/status-support-error-expected.txt: Added.
* media/modern-media-controls/status-support/status-support-error.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (208490 => 208491)


--- trunk/LayoutTests/ChangeLog	2016-11-09 22:29:45 UTC (rev 208490)
+++ trunk/LayoutTests/ChangeLog	2016-11-09 22:34:48 UTC (rev 208491)
@@ -1,3 +1,21 @@
+2016-11-09  Antoine Quint  <[email protected]>
+
+        [Modern Media Controls] Media Controller: set status label according to media state
+        https://bugs.webkit.org/show_bug.cgi?id=164557
+        <rdar://problem/29184097>
+
+        Reviewed by Dean Jackson.
+
+        Add new tests to check that we display the expected StatusLabel text when the media is in the
+        "Loading", "Error" and "Live Broadcast" states.
+
+        * http/tests/media/modern-media-controls/status-support/status-support-live-broadcast-expected.txt: Added.
+        * http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html: Added.
+        * http/tests/media/modern-media-controls/status-support/status-support-loading-expected.txt: Added.
+        * http/tests/media/modern-media-controls/status-support/status-support-loading.html: Added.
+        * media/modern-media-controls/status-support/status-support-error-expected.txt: Added.
+        * media/modern-media-controls/status-support/status-support-error.html: Added.
+
 2016-11-09  Yusuke Suzuki  <[email protected]>
 
         [DOMJIT] Implement Node::ownerDocument

Added: trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast-expected.txt (0 => 208491)


--- trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast-expected.txt	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,11 @@
+Testing the StatusSupport behavior for the loading state.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.statusLabel.text is "Live Broadcast"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html (0 => 208491)


--- trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,26 @@
+<script src=""
+<script src=""
+<body>
+<video src="" style="width: 320px; height: 240px;" autoplay></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>StatusSupport</code> behavior for the loading state.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+media.addEventListener("play", function() {
+    shouldBeEqualToString("mediaController.controls.statusLabel.text", "Live Broadcast");
+    debug("");
+    shadowRoot.host.remove();
+    media.remove();
+    finishJSTest();
+});
+
+</script>
+<script src=""
+</body>

Added: trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading-expected.txt (0 => 208491)


--- trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading-expected.txt	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,11 @@
+Testing the StatusSupport behavior for the loading state.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.statusLabel.text is "Loading"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading.html (0 => 208491)


--- trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/status-support/status-support-loading.html	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,26 @@
+<script src=""
+<script src=""
+<body>
+<video src="" style="width: 320px; height: 240px;"></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>StatusSupport</code> behavior for the loading state.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+media.addEventListener("stalled", function() {
+    shouldBeEqualToString("mediaController.controls.statusLabel.text", "Loading");
+    debug("");
+    shadowRoot.host.remove();
+    media.remove();
+    finishJSTest();
+});
+
+</script>
+<script src=""
+</body>

Added: trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error-expected.txt (0 => 208491)


--- trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error-expected.txt	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,11 @@
+Testing the StatusSupport behavior with an error.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.statusLabel.text is "Error"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error.html (0 => 208491)


--- trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error.html	                        (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-support/status-support-error.html	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,26 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" style="width: 320px; height: 240px;"></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>StatusSupport</code> behavior with an error.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+media.addEventListener("error", function() {
+    shouldBeEqualToString("mediaController.controls.statusLabel.text", "Error");
+    debug("");
+    shadowRoot.host.remove();
+    media.remove();
+    finishJSTest();
+});
+
+</script>
+<script src=""
+</body>

Modified: trunk/Source/WebCore/ChangeLog (208490 => 208491)


--- trunk/Source/WebCore/ChangeLog	2016-11-09 22:29:45 UTC (rev 208490)
+++ trunk/Source/WebCore/ChangeLog	2016-11-09 22:34:48 UTC (rev 208491)
@@ -1,3 +1,27 @@
+2016-11-09  Antoine Quint  <[email protected]>
+
+        [Modern Media Controls] Media Controller: set status label according to media state
+        https://bugs.webkit.org/show_bug.cgi?id=164557
+        <rdar://problem/29184097>
+
+        Reviewed by Dean Jackson.
+
+        Correctly set the StatusLabel text based on the media loading and network state.
+
+        Tests: http/tests/media/modern-media-controls/status-support/status-support-live-broadcast.html
+               http/tests/media/modern-media-controls/status-support/status-support-loading.html
+               media/modern-media-controls/status-support/status-support-error.html
+
+        * Modules/modern-media-controls/js-files:
+        * Modules/modern-media-controls/media/media-controller.js:
+        (MediaController):
+        * Modules/modern-media-controls/media/status-support.js: Added.
+        (StatusSupport.prototype.get control):
+        (StatusSupport.prototype.get mediaEvents):
+        (StatusSupport.prototype.syncControl):
+        (StatusSupport):
+        * WebCore.xcodeproj/project.pbxproj:
+
 2016-11-09  Zalan Bujtas  <[email protected]>
 
         No need to set setFlowThreadState on RenderText in createTextRenderer.

Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (208490 => 208491)


--- trunk/Source/WebCore/Modules/modern-media-controls/js-files	2016-11-09 22:29:45 UTC (rev 208490)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files	2016-11-09 22:34:48 UTC (rev 208491)
@@ -42,6 +42,7 @@
 media/scrubbing-support.js
 media/skip-back-support.js
 media/start-support.js
+media/status-support.js
 media/volume-support.js
 media/media-controller.js
 main.js

Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (208490 => 208491)


--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js	2016-11-09 22:29:45 UTC (rev 208490)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js	2016-11-09 22:34:48 UTC (rev 208491)
@@ -49,6 +49,7 @@
         new ScrubbingSupport(this);
         new SkipBackSupport(this);
         new StartSupport(this);
+        new StatusSupport(this);
         new VolumeSupport(this);
 
         this._updateControlsSize();

Copied: trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js (from rev 208489, trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js) (0 => 208491)


--- trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js	                        (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js	2016-11-09 22:34:48 UTC (rev 208491)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class StatusSupport extends MediaControllerSupport
+{
+
+    // Protected
+
+    get control()
+    {
+        return this.mediaController.controls.statusLabel;
+    }
+
+    get mediaEvents()
+    {
+        return ["durationchange", "loadstart", "error", "abort", "suspend", "stalled", "waiting", "emptied", "loadedmetadata", "loadeddata", "canplay", "canplaythrough"];
+    }
+
+    syncControl()
+    {
+        const media = this.mediaController.media;
+
+        if (!!media.error)
+            this.control.text = "Error";
+        if (media.duration === Number.POSITIVE_INFINITY && media.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA)
+            this.control.text = "Live Broadcast";
+        if (media.readyState <= HTMLMediaElement.HAVE_NOTHING && media.networkState === HTMLMediaElement.NETWORK_LOADING)
+            this.control.text = "Loading";
+    }
+
+}
+ 
\ No newline at end of file

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (208490 => 208491)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-11-09 22:29:45 UTC (rev 208490)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-11-09 22:34:48 UTC (rev 208491)
@@ -9945,6 +9945,7 @@
 		718C7F571DD385C500B733C8 /* status-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "status-label.js"; sourceTree = "<group>"; };
 		71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
 		71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
+		71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "status-support.js"; sourceTree = "<group>"; };
 		71B1E123164048CC00B1880A /* InspectorLayerTreeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorLayerTreeAgent.cpp; sourceTree = "<group>"; };
 		71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorLayerTreeAgent.h; sourceTree = "<group>"; };
 		71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInterfaceLayoutDirection.h; sourceTree = "<group>"; };
@@ -17938,6 +17939,7 @@
 				7157E3D11DC1EE4B0094550E /* scrubbing-support.js */,
 				71D2554F1DB900020004D76B /* skip-back-support.js */,
 				7177E2481DB80D2F00919A0B /* start-support.js */,
+				71B0460A1DD3C2EE00EE19CF /* status-support.js */,
 				717F90571DC40ED60006F520 /* volume-support.js */,
 			);
 			path = media;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to