Diff
Modified: trunk/LayoutTests/ChangeLog (213986 => 213987)
--- trunk/LayoutTests/ChangeLog 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 17:40:59 UTC (rev 213987)
@@ -1,3 +1,18 @@
+2017-03-15 Antoine Quint <grao...@apple.com>
+
+ [Modern Media Controls] Captions do not default to Auto when language is changed
+ https://bugs.webkit.org/show_bug.cgi?id=169675
+ <rdar://problem/30423369>
+
+ Reviewed by Eric Carlson.
+
+ Add new tests that check the cases where the expected selected track should be "Off" or "Auto".
+
+ * media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-off-text-track.html: Added.
+
2017-03-15 Ryan Haddad <ryanhad...@apple.com>
Mark http/tests/media/modern-media-controls/time-labels-support/long-time.html as flaky on mac-wk1.
Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt (0 => 213987)
--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt 2017-03-15 17:40:59 UTC (rev 213987)
@@ -0,0 +1,14 @@
+Ensure we have the Auto text track selected by default.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS shadowRoot.querySelector('button.tracks') became different from null
+PASS shadowRoot.querySelector('button.tracks').getBoundingClientRect().width became different from 0
+PASS shadowRoot.querySelector('.tracks-panel') became different from null
+PASS shadowRoot.querySelectorAll('li.selected')[1].textContent is "Auto (Recommended)"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html (0 => 213987)
--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html 2017-03-15 17:40:59 UTC (rev 213987)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Ensure we have the Auto text track selected by default.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks')", "null", () => {
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks').getBoundingClientRect().width", "0", () => {
+ window.internals.setCaptionDisplayMode("automatic");
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ shouldBecomeDifferent("shadowRoot.querySelector('.tracks-panel')", "null", () => {
+ shouldBeEqualToString("shadowRoot.querySelectorAll('li.selected')[1].textContent", "Auto (Recommended)");
+ debug("");
+ window.internals.setCaptionDisplayMode("forcedonly");
+ media.remove();
+ finishJSTest();
+ });
+ });
+ });
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt (0 => 213987)
--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt 2017-03-15 17:40:59 UTC (rev 213987)
@@ -0,0 +1,14 @@
+Ensure we have the Off text track selected by default.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS shadowRoot.querySelector('button.tracks') became different from null
+PASS shadowRoot.querySelector('button.tracks').getBoundingClientRect().width became different from 0
+PASS shadowRoot.querySelector('.tracks-panel') became different from null
+PASS shadowRoot.querySelectorAll('li.selected')[1].textContent is "Off"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html (0 => 213987)
--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html 2017-03-15 17:40:59 UTC (rev 213987)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Ensure we have the Off text track selected by default.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks')", "null", () => {
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks').getBoundingClientRect().width", "0", () => {
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ shouldBecomeDifferent("shadowRoot.querySelector('.tracks-panel')", "null", () => {
+ shouldBeEqualToString("shadowRoot.querySelectorAll('li.selected')[1].textContent", "Off");
+ debug("");
+ media.remove();
+ finishJSTest();
+ });
+ });
+ });
+});
+
+</script>
+<script src=""
+</body>
Modified: trunk/Source/WebCore/ChangeLog (213986 => 213987)
--- trunk/Source/WebCore/ChangeLog 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 17:40:59 UTC (rev 213987)
@@ -1,3 +1,21 @@
+2017-03-15 Antoine Quint <grao...@apple.com>
+
+ [Modern Media Controls] Captions do not default to Auto when language is changed
+ https://bugs.webkit.org/show_bug.cgi?id=169675
+ <rdar://problem/30423369>
+
+ Reviewed by Eric Carlson.
+
+ Ensure we correctly mark the Off and Auto items as selected when we are using the
+ Off and Auto tracks.
+
+ Tests: media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html
+ media/modern-media-controls/tracks-support/tracks-support-off-text-track.html
+
+ * Modules/modern-media-controls/media/tracks-support.js:
+ (TracksSupport.prototype.tracksPanelIsTrackInSectionSelected):
+ (TracksSupport.prototype.tracksPanelSelectionDidChange):
+
2017-03-15 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r213977.
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js (213986 => 213987)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-03-15 17:40:59 UTC (rev 213987)
@@ -100,7 +100,16 @@
{
if (sectionIndex == 0 && this._canPickAudioTracks())
return this._audioTracks()[trackIndex].enabled;
- return this._textTracks()[trackIndex].mode !== "disabled";
+
+ const trackItem = this._textTracks()[trackIndex];
+ const host = this.mediaController.host;
+ const usesAutomaticTrack = host ? host.captionDisplayMode === "automatic" : false;
+
+ if (host && trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual"))
+ return true;
+ if (host && trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack)
+ return true;
+ return !usesAutomaticTrack && trackItem.mode !== "disabled";
}
tracksPanelSelectionDidChange(trackIndex, sectionIndex)
@@ -107,6 +116,8 @@
{
if (sectionIndex == 0 && this._canPickAudioTracks())
this._audioTracks().forEach((audioTrack, index) => audioTrack.enabled = index === trackIndex);
+ else if (this.mediaController.host)
+ this.mediaController.host.setSelectedTextTrack(this._textTracks()[trackIndex]);
else
this._textTracks().forEach((textTrack, index) => textTrack.mode = index === trackIndex ? "showing" : "disabled");
