<!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>[196135] trunk/Source/WebCore</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/196135">196135</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 11:27:11 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>PageGroup::captionPreferences should return a reference
https://bugs.webkit.org/show_bug.cgi?id=153877
<rdar://problem/24506917>
Reviewed by Jer Noble.
No new tests, no functional change.
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::sortedTrackListForMenu):
(WebCore::MediaControlsHost::displayNameForTrack):
(WebCore::MediaControlsHost::captionMenuOffItem):
(WebCore::MediaControlsHost::captionDisplayMode):
* dom/Document.cpp:
(WebCore::Document::registerForCaptionPreferencesChangedCallbacks):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::addTextTrack):
(WebCore::HTMLMediaElement::configureTextTrackGroup):
(WebCore::HTMLMediaElement::setSelectedTextTrack):
(WebCore::HTMLMediaElement::configureTextTracks):
(WebCore::HTMLMediaElement::captionPreferencesChanged):
(WebCore::HTMLMediaElement::mediaPlayerPreferredAudioCharacteristics):
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay):
(WebCore::MediaControlClosedCaptionsTrackListElement::rebuildTrackListMenu):
(WebCore::MediaControlTextTrackContainerElement::updateActiveCuesFontSize):
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferencesChanged):
(WebCore::PageGroup::captionPreferences):
* page/PageGroup.h:
* platform/cocoa/WebVideoFullscreenModelVideoElement.mm:
(WebVideoFullscreenModelVideoElement::updateLegibleOptions):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::setShouldDisplayTrackKind):
(WebCore::InternalSettings::shouldDisplayTrackKind):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::Internals):
(WebCore::Internals::userPreferredAudioCharacteristics):
(WebCore::Internals::setUserPreferredAudioCharacteristic):
(WebCore::Internals::captionsStyleSheetOverride):
(WebCore::Internals::setCaptionsStyleSheetOverride):
(WebCore::Internals::setPrimaryAudioTrackLanguageOverride):
(WebCore::Internals::setCaptionDisplayMode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGrouph">trunk/Source/WebCore/page/PageGroup.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementmm">trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2016-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ PageGroup::captionPreferences should return a reference
+ https://bugs.webkit.org/show_bug.cgi?id=153877
+ <rdar://problem/24506917>
+
+ Reviewed by Jer Noble.
+
+ No new tests, no functional change.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::sortedTrackListForMenu):
+ (WebCore::MediaControlsHost::displayNameForTrack):
+ (WebCore::MediaControlsHost::captionMenuOffItem):
+ (WebCore::MediaControlsHost::captionDisplayMode):
+ * dom/Document.cpp:
+ (WebCore::Document::registerForCaptionPreferencesChangedCallbacks):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ (WebCore::HTMLMediaElement::addTextTrack):
+ (WebCore::HTMLMediaElement::configureTextTrackGroup):
+ (WebCore::HTMLMediaElement::setSelectedTextTrack):
+ (WebCore::HTMLMediaElement::configureTextTracks):
+ (WebCore::HTMLMediaElement::captionPreferencesChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerPreferredAudioCharacteristics):
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay):
+ (WebCore::MediaControlClosedCaptionsTrackListElement::rebuildTrackListMenu):
+ (WebCore::MediaControlTextTrackContainerElement::updateActiveCuesFontSize):
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::captionPreferencesChanged):
+ (WebCore::PageGroup::captionPreferences):
+ * page/PageGroup.h:
+ * platform/cocoa/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::updateLegibleOptions):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::setShouldDisplayTrackKind):
+ (WebCore::InternalSettings::shouldDisplayTrackKind):
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+ (WebCore::Internals::Internals):
+ (WebCore::Internals::userPreferredAudioCharacteristics):
+ (WebCore::Internals::setUserPreferredAudioCharacteristic):
+ (WebCore::Internals::captionsStyleSheetOverride):
+ (WebCore::Internals::setCaptionsStyleSheetOverride):
+ (WebCore::Internals::setPrimaryAudioTrackLanguageOverride):
+ (WebCore::Internals::setCaptionDisplayMode):
+
</ins><span class="cx"> 2016-02-04 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Removed unused Settings::setPrivateBrowsingEnabled.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -92,8 +92,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return Vector<RefPtr<TextTrack>>();
</span><span class="cx">
</span><del>- CaptionUserPreferences* captionPreferences = page->group().captionPreferences();
- return captionPreferences->sortedTrackListForMenu(trackList);
</del><ins>+ return page->group().captionPreferences().sortedTrackListForMenu(trackList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<AudioTrack>> MediaControlsHost::sortedTrackListForMenu(AudioTrackList* trackList)
</span><span class="lines">@@ -105,8 +104,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return Vector<RefPtr<AudioTrack>>();
</span><span class="cx">
</span><del>- CaptionUserPreferences* captionPreferences = page->group().captionPreferences();
- return captionPreferences->sortedTrackListForMenu(trackList);
</del><ins>+ return page->group().captionPreferences().sortedTrackListForMenu(trackList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String MediaControlsHost::displayNameForTrack(TextTrack* track)
</span><span class="lines">@@ -118,8 +116,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- CaptionUserPreferences* captionPreferences = page->group().captionPreferences();
- return captionPreferences->displayNameForTrack(track);
</del><ins>+ return page->group().captionPreferences().displayNameForTrack(track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String MediaControlsHost::displayNameForTrack(AudioTrack* track)
</span><span class="lines">@@ -131,8 +128,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- CaptionUserPreferences* captionPreferences = page->group().captionPreferences();
- return captionPreferences->displayNameForTrack(track);
</del><ins>+ return page->group().captionPreferences().displayNameForTrack(track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextTrack* MediaControlsHost::captionMenuOffItem()
</span><span class="lines">@@ -151,7 +147,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return emptyAtom;
</span><span class="cx">
</span><del>- switch (page->group().captionPreferences()->captionDisplayMode()) {
</del><ins>+ switch (page->group().captionPreferences().captionDisplayMode()) {
</ins><span class="cx"> case CaptionUserPreferences::Automatic:
</span><span class="cx"> return automaticKeyword();
</span><span class="cx"> case CaptionUserPreferences::ForcedOnly:
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -4715,7 +4715,7 @@
</span><span class="cx"> void Document::registerForCaptionPreferencesChangedCallbacks(Element* e)
</span><span class="cx"> {
</span><span class="cx"> if (page())
</span><del>- page()->group().captionPreferences()->setInterestedInCaptionPreferenceChanges();
</del><ins>+ page()->group().captionPreferences().setInterestedInCaptionPreferenceChanges();
</ins><span class="cx">
</span><span class="cx"> m_captionPreferencesChangedElements.add(e);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (document.page())
</span><del>- m_captionDisplayMode = document.page()->group().captionPreferences()->captionDisplayMode();
</del><ins>+ m_captionDisplayMode = document.page()->group().captionPreferences().captionDisplayMode();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="lines">@@ -3581,7 +3581,7 @@
</span><span class="cx"> Document& document = this->document();
</span><span class="cx"> document.registerForCaptionPreferencesChangedCallbacks(this);
</span><span class="cx"> if (Page* page = document.page())
</span><del>- m_captionDisplayMode = page->group().captionPreferences()->captionDisplayMode();
</del><ins>+ m_captionDisplayMode = page->group().captionPreferences().captionDisplayMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> track->setManualSelectionMode(m_captionDisplayMode == CaptionUserPreferences::Manual);
</span><span class="lines">@@ -3785,7 +3785,7 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::configureTextTrackGroup(%p)", this);
</span><span class="cx">
</span><span class="cx"> Page* page = document().page();
</span><del>- CaptionUserPreferences* captionPreferences = page ? page->group().captionPreferences() : 0;
</del><ins>+ CaptionUserPreferences* captionPreferences = page ? &page->group().captionPreferences() : 0;
</ins><span class="cx"> CaptionUserPreferences::CaptionDisplayMode displayMode = captionPreferences ? captionPreferences->captionDisplayMode() : CaptionUserPreferences::Automatic;
</span><span class="cx">
</span><span class="cx"> // First, find the track in the group that should be enabled (if any).
</span><span class="lines">@@ -4008,10 +4008,10 @@
</span><span class="cx"> trackList->item(i)->setMode(TextTrack::disabledKeyword());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CaptionUserPreferences* captionPreferences = document().page() ? document().page()->group().captionPreferences() : 0;
- if (!captionPreferences)
</del><ins>+ if (!document().page())
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ auto& captionPreferences = document().page()->group().captionPreferences();
</ins><span class="cx"> CaptionUserPreferences::CaptionDisplayMode displayMode;
</span><span class="cx"> if (trackToSelect == TextTrack::captionMenuOffItem())
</span><span class="cx"> displayMode = CaptionUserPreferences::ForcedOnly;
</span><span class="lines">@@ -4020,10 +4020,10 @@
</span><span class="cx"> else {
</span><span class="cx"> displayMode = CaptionUserPreferences::AlwaysOn;
</span><span class="cx"> if (trackToSelect->language().length())
</span><del>- captionPreferences->setPreferredLanguage(trackToSelect->language());
</del><ins>+ captionPreferences.setPreferredLanguage(trackToSelect->language());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- captionPreferences->setCaptionDisplayMode(displayMode);
</del><ins>+ captionPreferences.setCaptionDisplayMode(displayMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::configureTextTracks()
</span><span class="lines">@@ -5725,7 +5725,7 @@
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CaptionUserPreferences::CaptionDisplayMode displayMode = document().page()->group().captionPreferences()->captionDisplayMode();
</del><ins>+ CaptionUserPreferences::CaptionDisplayMode displayMode = document().page()->group().captionPreferences().captionDisplayMode();
</ins><span class="cx"> if (m_captionDisplayMode == displayMode)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -6167,9 +6167,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> HTMLMediaElement::mediaPlayerPreferredAudioCharacteristics() const
</span><span class="cx"> {
</span><del>- Page* page = document().page();
- if (CaptionUserPreferences* captionPreferences = page ? page->group().captionPreferences() : nullptr)
- return captionPreferences->preferredAudioCharacteristics();
</del><ins>+ if (Page* page = document().page())
+ return page->group().captionPreferences().preferredAudioCharacteristics();
</ins><span class="cx"> return Vector<String>();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx">
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><del>- CaptionUserPreferences::CaptionDisplayMode displayMode = document().page()->group().captionPreferences()->captionDisplayMode();
</del><ins>+ CaptionUserPreferences::CaptionDisplayMode displayMode = document().page()->group().captionPreferences().captionDisplayMode();
</ins><span class="cx">
</span><span class="cx"> HTMLMediaElement* mediaElement = parentMediaElement(this);
</span><span class="cx"> if (!mediaElement)
</span><span class="lines">@@ -802,8 +802,8 @@
</span><span class="cx">
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><del>- CaptionUserPreferences* captionPreferences = document().page()->group().captionPreferences();
- Vector<RefPtr<TextTrack>> tracksForMenu = captionPreferences->sortedTrackListForMenu(trackList);
</del><ins>+ auto& captionPreferences = document().page()->group().captionPreferences();
+ Vector<RefPtr<TextTrack>> tracksForMenu = captionPreferences.sortedTrackListForMenu(trackList);
</ins><span class="cx">
</span><span class="cx"> Ref<Element> captionsHeader = document().createElement(h3Tag, ASSERT_NO_EXCEPTION);
</span><span class="cx"> captionsHeader->appendChild(document().createTextNode(textTrackSubtitlesText()));
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& textTrack : tracksForMenu) {
</span><span class="cx"> Ref<Element> menuItem = document().createElement(liTag, ASSERT_NO_EXCEPTION);
</span><del>- menuItem->appendChild(document().createTextNode(captionPreferences->displayNameForTrack(textTrack.get())));
</del><ins>+ menuItem->appendChild(document().createTextNode(captionPreferences.displayNameForTrack(textTrack.get())));
</ins><span class="cx"> captionsMenuList->appendChild(menuItem.copyRef());
</span><span class="cx"> m_menuItems.append(menuItem.ptr());
</span><span class="cx"> m_menuToTrackMap.add(menuItem.ptr(), textTrack);
</span><span class="lines">@@ -1219,7 +1219,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> float smallestDimension = std::min(m_videoDisplaySize.size().height(), m_videoDisplaySize.size().width());
</span><del>- float fontScale = document().page()->group().captionPreferences()->captionFontSizeScaleAndImportance(m_fontSizeIsImportant);
</del><ins>+ float fontScale = document().page()->group().captionPreferences().captionFontSizeScaleAndImportance(m_fontSizeIsImportant);
</ins><span class="cx"> m_fontSize = lroundf(smallestDimension * fontScale);
</span><span class="cx">
</span><span class="cx"> for (auto& activeCue : mediaElement->currentlyActiveCues()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> PageCache::singleton().markPagesForCaptionPreferencesChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CaptionUserPreferences* PageGroup::captionPreferences()
</del><ins>+CaptionUserPreferences& PageGroup::captionPreferences()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_captionPreferences) {
</span><span class="cx"> #if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return m_captionPreferences.get();
</del><ins>+ return *m_captionPreferences.get();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.h (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.h 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/page/PageGroup.h 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> WEBCORE_EXPORT void captionPreferencesChanged();
</span><del>- WEBCORE_EXPORT CaptionUserPreferences* captionPreferences();
</del><ins>+ WEBCORE_EXPORT CaptionUserPreferences& captionPreferences();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -313,11 +313,11 @@
</span><span class="cx"> WTF::AtomicString displayMode = m_videoElement->mediaControlsHost()->captionDisplayMode();
</span><span class="cx"> TextTrack* offItem = m_videoElement->mediaControlsHost()->captionMenuOffItem();
</span><span class="cx"> TextTrack* automaticItem = m_videoElement->mediaControlsHost()->captionMenuAutomaticItem();
</span><del>- CaptionUserPreferences& captionPreferences = *m_videoElement->document().page()->group().captionPreferences();
</del><ins>+
+ auto& captionPreferences = m_videoElement->document().page()->group().captionPreferences();
</ins><span class="cx"> m_legibleTracksForMenu = captionPreferences.sortedTrackListForMenu(trackList);
</span><ins>+ m_audioTracksForMenu = captionPreferences.sortedTrackListForMenu(audioTrackList);
</ins><span class="cx">
</span><del>- m_audioTracksForMenu = captionPreferences.sortedTrackListForMenu(audioTrackList);
-
</del><span class="cx"> Vector<String> audioTrackDisplayNames;
</span><span class="cx"> uint64_t selectedAudioIndex = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -398,14 +398,14 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (!page())
</span><span class="cx"> return;
</span><del>- CaptionUserPreferences* captionPreferences = page()->group().captionPreferences();
</del><span class="cx">
</span><ins>+ auto& captionPreferences = page()->group().captionPreferences();
</ins><span class="cx"> if (equalLettersIgnoringASCIICase(kind, "subtitles"))
</span><del>- captionPreferences->setUserPrefersSubtitles(enabled);
</del><ins>+ captionPreferences.setUserPrefersSubtitles(enabled);
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(kind, "captions"))
</span><del>- captionPreferences->setUserPrefersCaptions(enabled);
</del><ins>+ captionPreferences.setUserPrefersCaptions(enabled);
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(kind, "textdescriptions"))
</span><del>- captionPreferences->setUserPrefersTextDescriptions(enabled);
</del><ins>+ captionPreferences.setUserPrefersTextDescriptions(enabled);
</ins><span class="cx"> else
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> #else
</span><span class="lines">@@ -421,14 +421,14 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (!page())
</span><span class="cx"> return false;
</span><del>- CaptionUserPreferences* captionPreferences = page()->group().captionPreferences();
</del><span class="cx">
</span><ins>+ auto& captionPreferences = page()->group().captionPreferences();
</ins><span class="cx"> if (equalLettersIgnoringASCIICase(kind, "subtitles"))
</span><del>- return captionPreferences->userPrefersSubtitles();
</del><ins>+ return captionPreferences.userPrefersSubtitles();
</ins><span class="cx"> if (equalLettersIgnoringASCIICase(kind, "captions"))
</span><del>- return captionPreferences->userPrefersCaptions();
</del><ins>+ return captionPreferences.userPrefersCaptions();
</ins><span class="cx"> if (equalLettersIgnoringASCIICase(kind, "textdescriptions"))
</span><del>- return captionPreferences->userPrefersTextDescriptions();
</del><ins>+ return captionPreferences.userPrefersTextDescriptions();
</ins><span class="cx">
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (196134 => 196135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-02-04 19:20:46 UTC (rev 196134)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-02-04 19:27:11 UTC (rev 196135)
</span><span class="lines">@@ -375,8 +375,8 @@
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(false);
</span><span class="cx"> page->inspectorController().setProfilerEnabled(false);
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- page->group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
- page->group().captionPreferences()->setTestingMode(false);
</del><ins>+ page->group().captionPreferences().setCaptionsStyleSheetOverride(emptyString());
+ page->group().captionPreferences().setTestingMode(false);
</ins><span class="cx"> #endif
</span><span class="cx"> if (!page->mainFrame().editor().isContinuousSpellCheckingEnabled())
</span><span class="cx"> page->mainFrame().editor().toggleContinuousSpellChecking();
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (document && document->page())
</span><del>- document->page()->group().captionPreferences()->setTestingMode(true);
</del><ins>+ document->page()->group().captionPreferences().setTestingMode(true);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="lines">@@ -1468,7 +1468,7 @@
</span><span class="cx"> if (!document || !document->page())
</span><span class="cx"> return Vector<String>();
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- return document->page()->group().captionPreferences()->preferredAudioCharacteristics();
</del><ins>+ return document->page()->group().captionPreferences().preferredAudioCharacteristics();
</ins><span class="cx"> #else
</span><span class="cx"> return Vector<String>();
</span><span class="cx"> #endif
</span><span class="lines">@@ -1480,7 +1480,7 @@
</span><span class="cx"> if (!document || !document->page())
</span><span class="cx"> return;
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- document->page()->group().captionPreferences()->setPreferredAudioCharacteristic(characteristic);
</del><ins>+ document->page()->group().captionPreferences().setPreferredAudioCharacteristic(characteristic);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(characteristic);
</span><span class="cx"> #endif
</span><span class="lines">@@ -2755,7 +2755,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- return document->page()->group().captionPreferences()->captionsStyleSheetOverride();
</del><ins>+ return document->page()->group().captionPreferences().captionsStyleSheetOverride();
</ins><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2770,7 +2770,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- document->page()->group().captionPreferences()->setCaptionsStyleSheetOverride(override);
</del><ins>+ document->page()->group().captionPreferences().setCaptionsStyleSheetOverride(override);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(override);
</span><span class="cx"> #endif
</span><span class="lines">@@ -2785,7 +2785,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- document->page()->group().captionPreferences()->setPrimaryAudioTrackLanguageOverride(language);
</del><ins>+ document->page()->group().captionPreferences().setPrimaryAudioTrackLanguageOverride(language);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(language);
</span><span class="cx"> #endif
</span><span class="lines">@@ -2800,16 +2800,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- CaptionUserPreferences* captionPreferences = document->page()->group().captionPreferences();
</del><ins>+ auto& captionPreferences = document->page()->group().captionPreferences();
</ins><span class="cx">
</span><span class="cx"> if (equalLettersIgnoringASCIICase(mode, "automatic"))
</span><del>- captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::Automatic);
</del><ins>+ captionPreferences.setCaptionDisplayMode(CaptionUserPreferences::Automatic);
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(mode, "forcedonly"))
</span><del>- captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::ForcedOnly);
</del><ins>+ captionPreferences.setCaptionDisplayMode(CaptionUserPreferences::ForcedOnly);
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(mode, "alwayson"))
</span><del>- captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::AlwaysOn);
</del><ins>+ captionPreferences.setCaptionDisplayMode(CaptionUserPreferences::AlwaysOn);
</ins><span class="cx"> else if (equalLettersIgnoringASCIICase(mode, "manual"))
</span><del>- captionPreferences->setCaptionDisplayMode(CaptionUserPreferences::Manual);
</del><ins>+ 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>