<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196096] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196096">196096</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-03 16:27:03 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196010">r196010</a>. rdar://problem/24417428</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediacontrolsMediaControlsHosth">branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmltrackTextTrackcpp">branches/safari-601-branch/Source/WebCore/html/track/TextTrack.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmltrackTextTrackh">branches/safari-601-branch/Source/WebCore/html/track/TextTrack.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmltrackTrackBaseh">branches/safari-601-branch/Source/WebCore/html/track/TrackBase.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageCaptionUserPreferencescpp">branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageCaptionUserPreferencesh">branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageCaptionUserPreferencesMediaAFcpp">branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoretestingInternalscpp">branches/safari-601-branch/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsmediatracktrackmanualmodeexpectedtxt">branches/safari-601-branch/LayoutTests/media/track/track-manual-mode-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsmediatracktrackmanualmodehtml">branches/safari-601-branch/LayoutTests/media/track/track-manual-mode.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r196010. rdar://problem/24417428
+
+ 2016-02-02 Eric Carlson <eric.carlson@apple.com>
+
+ Allow ports to disable automatic text track selection
+ https://bugs.webkit.org/show_bug.cgi?id=153761
+ <rdar://problem/24416768>
+
+ Reviewed by Darin Adler.
+
+ * media/track/track-manual-mode-expected.txt: Added.
+ * media/track/track-manual-mode.html: Added.
+
+2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r195912. rdar://problem/24417428
</span><span class="cx">
</span><span class="cx"> 2016-01-30 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsmediatracktrackmanualmodeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/media/track/track-manual-mode-expected.txt (0 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/media/track/track-manual-mode-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/media/track/track-manual-mode-expected.txt 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+Tests 'manual' caption mode.
+
+
+RUN(internals.setUserPreferredLanguages(['en']))
+RUN(internals.setPrimaryAudioTrackLanguageOverride('fr'))
+RUN(internals.setCaptionDisplayMode('manual'))
+EVENT(canplaythrough)
+
+** Forced tracks should be in .textTracks as well as in the menu,
+** but should be labeled as 'subtitles'
+
+EXPECTED (video.textTracks.length == '9') OK
+EXPECTED (trackMenuItems.length == '11') OK
+
+** No track should be enabled by default
+EXPECTED (video.textTracks[0].language == 'en') OK
+EXPECTED (video.textTracks[0].kind == 'subtitles') OK
+EXPECTED (video.textTracks[0].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[1].language == 'en') OK
+EXPECTED (video.textTracks[1].kind == 'subtitles') OK
+EXPECTED (video.textTracks[1].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[2].language == 'fr') OK
+EXPECTED (video.textTracks[2].kind == 'subtitles') OK
+EXPECTED (video.textTracks[2].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[3].language == 'fr') OK
+EXPECTED (video.textTracks[3].kind == 'subtitles') OK
+EXPECTED (video.textTracks[3].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[4].language == 'es') OK
+EXPECTED (video.textTracks[4].kind == 'subtitles') OK
+EXPECTED (video.textTracks[4].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[5].language == 'es') OK
+EXPECTED (video.textTracks[5].kind == 'subtitles') OK
+EXPECTED (video.textTracks[5].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[6].language == 'de') OK
+EXPECTED (video.textTracks[6].kind == 'subtitles') OK
+EXPECTED (video.textTracks[6].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[7].language == 'de') OK
+EXPECTED (video.textTracks[7].kind == 'subtitles') OK
+EXPECTED (video.textTracks[7].mode == 'disabled') OK
+
+EXPECTED (video.textTracks[8].language == 'en') OK
+EXPECTED (video.textTracks[8].kind == 'captions') OK
+EXPECTED (video.textTracks[8].mode == 'disabled') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsmediatracktrackmanualmodehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/media/track/track-manual-mode.html (0 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/media/track/track-manual-mode.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/media/track/track-manual-mode.html 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../media-controls.js></script>
+ <script src=../trackmenu-test.js></script>
+ <script src=../video-test.js></script>
+ <script>
+
+ function testTracks()
+ {
+ consoleWrite(`<br><i>** Forced tracks should be in .textTracks as well as in the menu,`);
+ consoleWrite(`<i>** but should be labeled as 'subtitles'</i><br>`);
+ testExpected("video.textTracks.length", 9);
+
+ // Click the CC button to show the menu because it isn't created until it becomes visible.
+ clickCCButton();
+
+ trackMenuItems = captionTrackMenuList();
+ if (!trackMenuItems) {
+ failTest("Failed to find track menu!");
+ return;
+ }
+ testExpected("trackMenuItems.length", 11);
+
+ consoleWrite("<br><i>** No track should be enabled by default<" + "/i>");
+ testExpected("video.textTracks[0].language", "en");
+ testExpected("video.textTracks[0].kind", "subtitles");
+ testExpected("video.textTracks[0].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[1].language", "en");
+ testExpected("video.textTracks[1].kind", "subtitles");
+ testExpected("video.textTracks[1].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[2].language", "fr");
+ testExpected("video.textTracks[2].kind", "subtitles");
+ testExpected("video.textTracks[2].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[3].language", "fr");
+ testExpected("video.textTracks[3].kind", "subtitles");
+ testExpected("video.textTracks[3].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[4].language", "es");
+ testExpected("video.textTracks[4].kind", "subtitles");
+ testExpected("video.textTracks[4].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[5].language", "es");
+ testExpected("video.textTracks[5].kind", "subtitles");
+ testExpected("video.textTracks[5].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[6].language", "de");
+ testExpected("video.textTracks[6].kind", "subtitles");
+ testExpected("video.textTracks[6].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[7].language", "de");
+ testExpected("video.textTracks[7].kind", "subtitles");
+ testExpected("video.textTracks[7].mode", "disabled");
+ consoleWrite("");
+
+ testExpected("video.textTracks[8].language", "en");
+ testExpected("video.textTracks[8].kind", "captions");
+ testExpected("video.textTracks[8].mode", "disabled");
+ consoleWrite("");
+
+ endTest();
+ }
+
+ function setup()
+ {
+ findMediaElement();
+ run("internals.setUserPreferredLanguages(['en'])");
+ run("internals.setPrimaryAudioTrackLanguageOverride('fr')");
+ run("internals.setCaptionDisplayMode('manual')");
+ video.src = '../content/CC+Subtitles.mov';
+
+ waitForEvent('canplaythrough', testTracks);
+ }
+
+ </script>
+ </head>
+ <body onload="setup()">
+ <p>Tests 'manual' caption mode.</p>
+ <video width="640" height="360" controls>
+ </video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -1,5 +1,62 @@
</span><span class="cx"> 2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r196010. rdar://problem/24417428
+
+ 2016-02-02 Eric Carlson <eric.carlson@apple.com>
+
+ Allow ports to disable automatic text track selection
+ https://bugs.webkit.org/show_bug.cgi?id=153761
+ <rdar://problem/24416768>
+
+ Reviewed by Darin Adler.
+
+ Test: media/track/track-manual-mode.html
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::manualKeyword): New.
+ (WebCore::MediaControlsHost::captionDisplayMode): Support 'manual' mode.
+ * Modules/mediacontrols/MediaControlsHost.h:
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.buildCaptionMenu): Check the 'off' item when in manual mode.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::addTextTrack): Update m_captionDisplayMode when called for the first
+ time so it is always correct. Set the track's manual selection mode as appropriate.
+ (WebCore::HTMLMediaElement::captionPreferencesChanged): Set each track's manual selection
+ mode as appropriate.
+
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::kind): Return 'subtitles' for forced tracks when in manual mode.
+ * html/track/TextTrack.h:
+
+ * html/track/TrackBase.h:
+ (WebCore::TrackBase::kind): Make virtual.
+
+ * page/CaptionUserPreferences.cpp:
+ (WebCore::CaptionUserPreferences::beginBlockingNotifications): New.
+ (WebCore::CaptionUserPreferences::endBlockingNotifications): Ditto.
+ (WebCore::CaptionUserPreferences::notify): Don't notify when blocked.
+ * page/CaptionUserPreferences.h:
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF): Set manual mode
+ when appropriate.
+ (WebCore::CaptionUserPreferencesMediaAF::captionDisplayMode): Check manual mode.
+ (WebCore::CaptionUserPreferencesMediaAF::setCaptionDisplayMode): Ditto.
+ (WebCore::CaptionUserPreferencesMediaAF::setPreferredLanguage): Ditto.
+ (WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Return zero when in manual mode.
+ (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu): Consider manual mode. Fix
+ typos in logging.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::mediaDescriptionForKind): Return 'auxiliary' when in manual mode.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setCaptionDisplayMode): Support manual mode.
+
+2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r195912. rdar://problem/24417428
</span><span class="cx">
</span><span class="cx"> 2016-01-30 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -61,6 +61,13 @@
</span><span class="cx"> return alwaysOn;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const AtomicString& MediaControlsHost::manualKeyword()
+{
+ DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, alwaysOn, ("manual", AtomicString::ConstructFromLiteral));
+ return alwaysOn;
+}
+
+
</ins><span class="cx"> Ref<MediaControlsHost> MediaControlsHost::create(HTMLMediaElement* mediaElement)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MediaControlsHost(mediaElement));
</span><span class="lines">@@ -151,6 +158,8 @@
</span><span class="cx"> return forcedOnlyKeyword();
</span><span class="cx"> case CaptionUserPreferences::AlwaysOn:
</span><span class="cx"> return alwaysOnKeyword();
</span><ins>+ case CaptionUserPreferences::Manual:
+ return manualKeyword();
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return emptyAtom;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> static const AtomicString& automaticKeyword();
</span><span class="cx"> static const AtomicString& forcedOnlyKeyword();
</span><span class="cx"> static const AtomicString& alwaysOnKeyword();
</span><ins>+ static const AtomicString& manualKeyword();
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*);
</span><span class="cx"> Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList*);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -1737,7 +1737,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (offMenu && displayMode === 'forced-only' && !trackMenuItemSelected) {
</del><ins>+ if (offMenu && (displayMode === 'forced-only' || displayMode === 'manual') && !trackMenuItemSelected) {
</ins><span class="cx"> offMenu.classList.add(this.ClassNames.selected);
</span><span class="cx"> offMenu.setAttribute('tabindex', '0');
</span><span class="cx"> offMenu.setAttribute('aria-checked', 'true');
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -3515,9 +3515,13 @@
</span><span class="cx">
</span><span class="cx"> if (!m_requireCaptionPreferencesChangedCallbacks) {
</span><span class="cx"> m_requireCaptionPreferencesChangedCallbacks = true;
</span><del>- document().registerForCaptionPreferencesChangedCallbacks(this);
</del><ins>+ Document& document = this->document();
+ document.registerForCaptionPreferencesChangedCallbacks(this);
+ if (Page* page = document.page())
+ m_captionDisplayMode = page->group().captionPreferences()->captionDisplayMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ track->setManualSelectionMode(m_captionDisplayMode == CaptionUserPreferences::Manual);
</ins><span class="cx"> textTracks()->append(track);
</span><span class="cx">
</span><span class="cx"> closeCaptionTracksChanged();
</span><span class="lines">@@ -5630,6 +5634,11 @@
</span><span class="cx"> if (m_captionDisplayMode == displayMode)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (m_captionDisplayMode == CaptionUserPreferences::Manual || displayMode == CaptionUserPreferences::Manual) {
+ for (unsigned i = 0; i < m_textTracks->length(); ++i)
+ m_textTracks->item(i)->setManualSelectionMode(displayMode == CaptionUserPreferences::Manual);
+ }
+
</ins><span class="cx"> m_captionDisplayMode = displayMode;
</span><span class="cx"> setWebkitClosedCaptionsVisible(m_captionDisplayMode == CaptionUserPreferences::AlwaysOn);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmltrackTextTrackcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/track/TextTrack.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/track/TextTrack.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/html/track/TextTrack.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -177,6 +177,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AtomicString TextTrack::kind() const
+{
+ AtomicString kind = TrackBase::kind();
+ if (!m_manualSelectionMode || kind != forcedKeyword())
+ return kind;
+
+ return subtitlesKeyword();
+}
+
</ins><span class="cx"> void TextTrack::setKind(const AtomicString& newKind)
</span><span class="cx"> {
</span><span class="cx"> String oldKind = kind();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmltrackTextTrackh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/track/TextTrack.h (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/track/TextTrack.h 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/html/track/TextTrack.h 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -92,7 +92,8 @@
</span><span class="cx"> static const AtomicString& hiddenKeyword();
</span><span class="cx"> static const AtomicString& showingKeyword();
</span><span class="cx">
</span><del>- virtual void setKind(const AtomicString&) override;
</del><ins>+ void setKind(const AtomicString&) override;
+ AtomicString kind() const override;
</ins><span class="cx">
</span><span class="cx"> virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyString(); }
</span><span class="cx">
</span><span class="lines">@@ -158,6 +159,8 @@
</span><span class="cx">
</span><span class="cx"> virtual MediaTime startTimeVariance() const { return MediaTime::zeroTime(); }
</span><span class="cx">
</span><ins>+ void setManualSelectionMode(bool mode) { m_manualSelectionMode = mode; }
+
</ins><span class="cx"> using RefCounted<TrackBase>::ref;
</span><span class="cx"> using RefCounted<TrackBase>::deref;
</span><span class="cx">
</span><span class="lines">@@ -195,6 +198,7 @@
</span><span class="cx"> int m_trackIndex;
</span><span class="cx"> int m_renderedTrackIndex;
</span><span class="cx"> bool m_hasBeenConfigured;
</span><ins>+ bool m_manualSelectionMode { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline TextTrack* toTextTrack(TrackBase* track)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmltrackTrackBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/track/TrackBase.h (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/track/TrackBase.h 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/html/track/TrackBase.h 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual AtomicString id() const { return m_id; }
</span><span class="cx"> virtual void setId(const AtomicString& id) { m_id = id; }
</span><span class="cx">
</span><del>- AtomicString kind() const { return m_kind; }
</del><ins>+ virtual AtomicString kind() const { return m_kind; }
</ins><span class="cx"> virtual void setKind(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> AtomicString label() const { return m_label; }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -59,8 +59,22 @@
</span><span class="cx"> captionPreferencesChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CaptionUserPreferences::beginBlockingNotifications()
+{
+ ++m_blockNotificationsCounter;
+}
+
+void CaptionUserPreferences::endBlockingNotifications()
+{
+ ASSERT(m_blockNotificationsCounter);
+ --m_blockNotificationsCounter;
+}
+
</ins><span class="cx"> void CaptionUserPreferences::notify()
</span><span class="cx"> {
</span><ins>+ if (m_blockNotificationsCounter)
+ return;
+
</ins><span class="cx"> m_havePreferences = true;
</span><span class="cx"> if (!m_timer.isActive())
</span><span class="cx"> m_timer.startOneShot(0);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageCaptionUserPreferencesh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.h (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.h 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferences.h 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx"> enum CaptionDisplayMode {
</span><span class="cx"> Automatic,
</span><span class="cx"> ForcedOnly,
</span><del>- AlwaysOn
</del><ins>+ AlwaysOn,
+ Manual,
</ins><span class="cx"> };
</span><span class="cx"> virtual CaptionDisplayMode captionDisplayMode() const;
</span><span class="cx"> virtual void setCaptionDisplayMode(CaptionDisplayMode);
</span><span class="lines">@@ -98,18 +99,21 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void updateCaptionStyleSheetOveride();
</span><ins>+ void beginBlockingNotifications();
+ void endBlockingNotifications();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void timerFired();
</span><span class="cx"> void notify();
</span><span class="cx">
</span><span class="cx"> PageGroup& m_pageGroup;
</span><del>- CaptionDisplayMode m_displayMode;
</del><ins>+ mutable CaptionDisplayMode m_displayMode;
</ins><span class="cx"> Timer m_timer;
</span><span class="cx"> String m_userPreferredLanguage;
</span><span class="cx"> String m_userPreferredAudioCharacteristic;
</span><span class="cx"> String m_captionsStyleSheetOverride;
</span><span class="cx"> String m_primaryAudioTrackLanguageOverride;
</span><ins>+ unsigned m_blockNotificationsCounter { 0 };
</ins><span class="cx"> bool m_testingMode;
</span><span class="cx"> bool m_havePreferences;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -74,9 +74,19 @@
</span><span class="cx"> #define kCTFontNameAttribute getkCTFontNameAttribute()
</span><span class="cx">
</span><span class="cx"> #define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
</span><del>-#endif
-#endif
</del><span class="cx">
</span><ins>+typedef Boolean (*MTEnableCaption2015BehaviorPtrType) ();
+static MTEnableCaption2015BehaviorPtrType MTEnableCaption2015BehaviorPtr() { return nullptr; }
+
+#else
+
+SOFT_LINK_FRAMEWORK(MediaToolbox)
+SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
+
+#endif // PLATFORM(WIN)
+
+#endif // HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><span class="lines">@@ -99,6 +109,21 @@
</span><span class="cx"> , m_listeningForPreferenceChanges(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+ static bool initialized;
+ if (!initialized) {
+ initialized = true;
+
+ MTEnableCaption2015BehaviorPtrType function = MTEnableCaption2015BehaviorPtr();
+ if (!function || !function())
+ return;
+
+ beginBlockingNotifications();
+ CaptionUserPreferences::setCaptionDisplayMode(Manual);
+ setUserPrefersCaptions(false);
+ setUserPrefersSubtitles(false);
+ setUserPrefersTextDescriptions(false);
+ endBlockingNotifications();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CaptionUserPreferencesMediaAF::~CaptionUserPreferencesMediaAF()
</span><span class="lines">@@ -115,8 +140,9 @@
</span><span class="cx">
</span><span class="cx"> CaptionUserPreferences::CaptionDisplayMode CaptionUserPreferencesMediaAF::captionDisplayMode() const
</span><span class="cx"> {
</span><del>- if (testingMode() || !MediaAccessibilityLibrary())
- return CaptionUserPreferences::captionDisplayMode();
</del><ins>+ CaptionDisplayMode internalMode = CaptionUserPreferences::captionDisplayMode();
+ if (internalMode == Manual || testingMode() || !MediaAccessibilityLibrary())
+ return internalMode;
</ins><span class="cx">
</span><span class="cx"> MACaptionAppearanceDisplayType displayType = MACaptionAppearanceGetDisplayType(kMACaptionAppearanceDomainUser);
</span><span class="cx"> switch (displayType) {
</span><span class="lines">@@ -141,6 +167,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (captionDisplayMode() == Manual)
+ return;
+
</ins><span class="cx"> MACaptionAppearanceDisplayType displayType = kMACaptionAppearanceDisplayTypeForcedOnly;
</span><span class="cx"> switch (mode) {
</span><span class="cx"> case Automatic:
</span><span class="lines">@@ -431,6 +460,9 @@
</span><span class="cx">
</span><span class="cx"> void CaptionUserPreferencesMediaAF::setPreferredLanguage(const String& language)
</span><span class="cx"> {
</span><ins>+ if (CaptionUserPreferences::captionDisplayMode() == Manual)
+ return;
+
</ins><span class="cx"> if (testingMode() || !MediaAccessibilityLibrary()) {
</span><span class="cx"> CaptionUserPreferences::setPreferredLanguage(language);
</span><span class="cx"> return;
</span><span class="lines">@@ -660,6 +692,9 @@
</span><span class="cx"> int CaptionUserPreferencesMediaAF::textTrackSelectionScore(TextTrack* track, HTMLMediaElement* mediaElement) const
</span><span class="cx"> {
</span><span class="cx"> CaptionDisplayMode displayMode = captionDisplayMode();
</span><ins>+ if (displayMode == Manual)
+ return 0;
+
</ins><span class="cx"> bool legacyOverride = mediaElement->webkitClosedCaptionsVisible();
</span><span class="cx"> if (displayMode == AlwaysOn && (!userPrefersSubtitles() && !userPrefersCaptions() && !legacyOverride))
</span><span class="cx"> return 0;
</span><span class="lines">@@ -803,6 +838,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<TextTrack>> tracksForMenu;
</span><span class="cx"> HashSet<String> languagesIncluded;
</span><ins>+ CaptionDisplayMode displayMode = captionDisplayMode();
</ins><span class="cx"> bool prefersAccessibilityTracks = userPrefersCaptions();
</span><span class="cx"> bool filterTrackList = shouldFilterTrackMenu();
</span><span class="cx">
</span><span class="lines">@@ -810,17 +846,23 @@
</span><span class="cx"> TextTrack* track = trackList->item(i);
</span><span class="cx"> String language = displayNameForLanguageLocale(track->language());
</span><span class="cx">
</span><ins>+ if (displayMode == Manual) {
+ LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - adding '%s' track with language '%s' because selection mode is 'manual'", track->kind().string().utf8().data(), language.utf8().data());
+ tracksForMenu.append(track);
+ continue;
+ }
+
</ins><span class="cx"> const AtomicString& kind = track->kind();
</span><span class="cx"> if (kind != TextTrack::captionsKeyword() && kind != TextTrack::descriptionsKeyword() && kind != TextTrack::subtitlesKeyword())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (track->containsOnlyForcedSubtitles()) {
</span><del>- LOG(Media, "CaptionUserPreferencesMac::sortedTrackListForMenu - skipping '%s' track with language '%s' because it contains only forced subtitles", track->kind().string().utf8().data(), language.utf8().data());
</del><ins>+ LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - skipping '%s' track with language '%s' because it contains only forced subtitles", track->kind().string().utf8().data(), language.utf8().data());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (track->isEasyToRead()) {
</span><del>- LOG(Media, "CaptionUserPreferencesMac::sortedTrackListForMenu - adding '%s' track with language '%s' because it is 'easy to read'", track->kind().string().utf8().data(), language.utf8().data());
</del><ins>+ LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - adding '%s' track with language '%s' because it is 'easy to read'", track->kind().string().utf8().data(), language.utf8().data());
</ins><span class="cx"> if (!language.isEmpty())
</span><span class="cx"> languagesIncluded.add(language);
</span><span class="cx"> tracksForMenu.append(track);
</span><span class="lines">@@ -828,7 +870,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (track->mode() == TextTrack::showingKeyword()) {
</span><del>- LOG(Media, "CaptionUserPreferencesMac::sortedTrackListForMenu - adding '%s' track with language '%s' because it is already visible", track->kind().string().utf8().data(), language.utf8().data());
</del><ins>+ LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - adding '%s' track with language '%s' because it is already visible", track->kind().string().utf8().data(), language.utf8().data());
</ins><span class="cx"> if (!language.isEmpty())
</span><span class="cx"> languagesIncluded.add(language);
</span><span class="cx"> tracksForMenu.append(track);
</span><span class="lines">@@ -860,7 +902,7 @@
</span><span class="cx"> languagesIncluded.add(language);
</span><span class="cx"> tracksForMenu.append(track);
</span><span class="cx">
</span><del>- LOG(Media, "CaptionUserPreferencesMac::sortedTrackListForMenu - adding '%s' track with language '%s', is%s main program content", track->kind().string().utf8().data(), language.utf8().data(), track->isMainProgramContent() ? "" : " NOT");
</del><ins>+ LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - adding '%s' track with language '%s', is%s main program content", track->kind().string().utf8().data(), language.utf8().data(), track->isMainProgramContent() ? "" : " NOT");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now that we have filtered for the user's accessibility/translation preference, add all tracks with a unique language without regard to track type.
</span><span class="lines">@@ -868,6 +910,9 @@
</span><span class="cx"> TextTrack* track = trackList->item(i);
</span><span class="cx"> String language = displayNameForLanguageLocale(track->language());
</span><span class="cx">
</span><ins>+ if (tracksForMenu.contains(track))
+ continue;
+
</ins><span class="cx"> const AtomicString& kind = track->kind();
</span><span class="cx"> if (kind != TextTrack::captionsKeyword() && kind != TextTrack::descriptionsKeyword() && kind != TextTrack::subtitlesKeyword())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -263,6 +263,7 @@
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackSourceKey, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString*)
</span><ins>+SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicIsAuxiliaryContent, NSString*)
</ins><span class="cx">
</span><span class="cx"> #define AVURLAssetHTTPCookiesKey getAVURLAssetHTTPCookiesKey()
</span><span class="cx"> #define AVURLAssetOutOfBandAlternateTracksKey getAVURLAssetOutOfBandAlternateTracksKey()
</span><span class="lines">@@ -274,6 +275,7 @@
</span><span class="cx"> #define AVOutOfBandAlternateTrackSourceKey getAVOutOfBandAlternateTrackSourceKey()
</span><span class="cx"> #define AVMediaCharacteristicDescribesMusicAndSoundForAccessibility getAVMediaCharacteristicDescribesMusicAndSoundForAccessibility()
</span><span class="cx"> #define AVMediaCharacteristicTranscribesSpokenDialogForAccessibility getAVMediaCharacteristicTranscribesSpokenDialogForAccessibility()
</span><ins>+#define AVMediaCharacteristicIsAuxiliaryContent getAVMediaCharacteristicIsAuxiliaryContent()
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><span class="lines">@@ -295,6 +297,9 @@
</span><span class="cx"> #define AVURLAssetBoundNetworkInterfaceName getAVURLAssetBoundNetworkInterfaceName()
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+SOFT_LINK_FRAMEWORK(MediaToolbox)
+SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> enum MediaPlayerAVFoundationObservationContext {
</span><span class="lines">@@ -746,6 +751,10 @@
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> static const NSArray* mediaDescriptionForKind(PlatformTextTrack::TrackKind kind)
</span><span class="cx"> {
</span><ins>+ static bool manualSelectionMode = MTEnableCaption2015BehaviorPtr() && MTEnableCaption2015BehaviorPtr()();
+ if (manualSelectionMode)
+ return @[ AVMediaCharacteristicIsAuxiliaryContent ];
+
</ins><span class="cx"> // FIXME: Match these to correct types:
</span><span class="cx"> if (kind == PlatformTextTrack::Caption)
</span><span class="cx"> return [NSArray arrayWithObjects: AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, nil];
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/testing/Internals.cpp (196095 => 196096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-02-04 00:26:57 UTC (rev 196095)
+++ branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-02-04 00:27:03 UTC (rev 196096)
</span><span class="lines">@@ -2522,6 +2522,8 @@
</span><span class="cx"> captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::ForcedOnly);
</span><span class="cx"> else if (equalIgnoringCase(mode, "AlwaysOn"))
</span><span class="cx"> captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::AlwaysOn);
</span><ins>+ else if (equalIgnoringCase(mode, "manual"))
+ captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::Manual);
</ins><span class="cx"> else
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>