<!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>[183676] trunk</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/183676">183676</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 09:57:38 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix text track language selection logic
https://bugs.webkit.org/show_bug.cgi?id=144467
Reviewed by Brent Fulgham.
Source/WebCore:
No new tests, media/track/track-language-preference.html was updated.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureTextTrackGroup): Correct a minor style typo.
(WebCore::HTMLMediaElement::configureTextTrackDisplay): Update logging.
* page/CaptionUserPreferences.cpp:
(WebCore::CaptionUserPreferences::textTrackSelectionScore): Minor cleanup.
(WebCore::CaptionUserPreferences::textTrackLanguageSelectionScore): Give exact matches a
higher score.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Update for
indexOfBestMatchingLanguageInList change.
* platform/Language.cpp:
(WebCore::indexOfBestMatchingLanguageInList): Add parameter for exact match. Convert the
passed language to lower case as we do with the preferred languages.
* platform/Language.h:
LayoutTests:
* media/track/track-language-preference-expected.txt:
* media/track/track-language-preference.html: Updated, add new tests.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatracktracklanguagepreferenceexpectedtxt">trunk/LayoutTests/media/track/track-language-preference-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktracklanguagepreferencehtml">trunk/LayoutTests/media/track/track-language-preference.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencescpp">trunk/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguagecpp">trunk/Source/WebCore/platform/Language.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguageh">trunk/Source/WebCore/platform/Language.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/LayoutTests/ChangeLog 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-01 Eric Carlson <eric.carlson@apple.com>
+
+ Fix text track language selection logic
+ https://bugs.webkit.org/show_bug.cgi?id=144467
+
+ Reviewed by Brent Fulgham.
+
+ * media/track/track-language-preference-expected.txt:
+ * media/track/track-language-preference.html: Updated, add new tests.
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-05-01 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening. Rebaseline some tests for WebKitGTK+.
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktracklanguagepreferenceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-language-preference-expected.txt (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-language-preference-expected.txt 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/LayoutTests/media/track/track-language-preference-expected.txt 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -3,7 +3,8 @@
</span><span class="cx">
</span><span class="cx"> **Set track preferences and user preferred languages
</span><span class="cx"> RUN(internals.settings.setShouldDisplayTrackKind('Captions', true))
</span><del>-RUN(internals.setUserPreferredLanguages(['jp', 'es-ES', 'en', 'fr']))
</del><ins>+RUN(internals.setUserPreferredLanguages(['jp', 'es-ES', 'en', 'fr', 'pt-PT']))
+EVENT(canplaythrough)
</ins><span class="cx">
</span><span class="cx"> Test: a track language matches one of the user's preferred languages exactly.
</span><span class="cx"> - creating tracks for: [fr,en,jp].
</span><span class="lines">@@ -29,6 +30,11 @@
</span><span class="cx"> EXPECTED (track.readyState == '2') OK
</span><span class="cx"> EXPECTED (track.srclang == 'fa') OK
</span><span class="cx">
</span><del>-EXPECTED (video.textTracks.length == '3') OK
</del><ins>+Test: a track language without locale matches one of the user's preferred languages exactly when another language matches locale only.
+- creating tracks for: [pt-BR,nl-NL,pt-PT].
+EVENT(load)
+EXPECTED (track.readyState == '2') OK
+EXPECTED (track.srclang == 'pt-PT') OK
+
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktracklanguagepreferencehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-language-preference.html (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-language-preference.html 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/LayoutTests/media/track/track-language-preference.html 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> var timer = null;
</span><del>- var expectedLanguage;
</del><span class="cx"> var testList =
</span><span class="cx"> {
</span><span class="cx"> current : -1,
</span><span class="lines">@@ -37,6 +36,11 @@
</span><span class="cx"> languages : ['fa', 'ru', 'no'],
</span><span class="cx"> expectedLanguage : "fa",
</span><span class="cx"> },
</span><ins>+ {
+ description: "a track language without locale matches one of the user's preferred languages exactly when another language matches locale only",
+ languages : ['pt-BR', 'nl-NL', 'pt-PT'],
+ expectedLanguage : "pt-PT",
+ },
</ins><span class="cx"> ]
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -45,8 +49,6 @@
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> testList.current++;
</span><span class="cx"> if (testList.current >= testList.tests.length) {
</span><del>- var tracks = document.querySelectorAll('track');
- testExpected("video.textTracks.length", tracks.length);
</del><span class="cx"> endTest();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -59,12 +61,10 @@
</span><span class="cx"> {
</span><span class="cx"> consoleWrite("EVENT(load)");
</span><span class="cx">
</span><del>- // Don't log the event name because the order of the two events in not predictable.
</del><span class="cx"> track = event.target;
</span><span class="cx"> testExpected("track.readyState", HTMLTrackElement.LOADED);
</span><span class="cx"> testExpected("track.srclang", testList.tests[testList.current].expectedLanguage);
</span><del>-
- timer = setTimeout(runNextTest, 200);
</del><ins>+ timer = setTimeout(runNextTest, 100);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setPreferences()
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> consoleWrite("<i>**Set track preferences and user preferred languages<" + "/i>");
</span><span class="cx"> run("internals.settings.setShouldDisplayTrackKind('Captions', true)");
</span><del>- run("internals.setUserPreferredLanguages(['jp', 'es-ES', 'en', 'fr'])");
</del><ins>+ run("internals.setUserPreferredLanguages(['jp', 'es-ES', 'en', 'fr', 'pt-PT'])");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function createTrackElement(language, src)
</span><span class="lines">@@ -102,18 +102,18 @@
</span><span class="cx">
</span><span class="cx"> function setup()
</span><span class="cx"> {
</span><del>- findMediaElement();
-
</del><ins>+ setCaptionDisplayMode('AlwaysOn');
</ins><span class="cx"> setPreferences("Subtitles", true);
</span><span class="cx">
</span><del>- runNextTest();
</del><ins>+ findMediaElement();
+ video.src = findMediaFile('video', '../content/test');
+ waitForEvent('canplaythrough', runNextTest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="setup()">
</span><span class="cx"> <p>Tests that the user's preferred languages are honored.</p>
</span><del>- <video>
- </video>
</del><ins>+ <video></video>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -988,7 +988,6 @@
</span><span class="cx"> webkit.org/b/28221 media/audio-delete-while-step-button-clicked.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # These tests always time out.
</span><del>-webkit.org/b/112492 media/track/track-language-preference.html [ Skip ]
</del><span class="cx"> webkit.org/b/112492 media/track/track-prefer-captions.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/136708 http/tests/media/video-play-stall-seek.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/ChangeLog 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-05-01 Eric Carlson <eric.carlson@apple.com>
+
+ Fix text track language selection logic
+ https://bugs.webkit.org/show_bug.cgi?id=144467
+
+ Reviewed by Brent Fulgham.
+
+ No new tests, media/track/track-language-preference.html was updated.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::configureTextTrackGroup): Correct a minor style typo.
+ (WebCore::HTMLMediaElement::configureTextTrackDisplay): Update logging.
+
+ * page/CaptionUserPreferences.cpp:
+ (WebCore::CaptionUserPreferences::textTrackSelectionScore): Minor cleanup.
+ (WebCore::CaptionUserPreferences::textTrackLanguageSelectionScore): Give exact matches a
+ higher score.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Update for
+ indexOfBestMatchingLanguageInList change.
+
+ * platform/Language.cpp:
+ (WebCore::indexOfBestMatchingLanguageInList): Add parameter for exact match. Convert the
+ passed language to lower case as we do with the preferred languages.
+ * platform/Language.h:
+
</ins><span class="cx"> 2015-05-01 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Freetype] Add support for the font-synthesis property
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -3563,7 +3563,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">@@ -5357,10 +5357,11 @@
</span><span class="cx"> if (m_processingPreferenceChange)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this);
</del><ins>+ LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p) - checkType = %s", this, checkType == CheckTextTrackVisibility ? "check-visibility" : "assume-visibility-changed");
</ins><span class="cx">
</span><span class="cx"> bool haveVisibleTextTrack = false;
</span><span class="cx"> for (unsigned i = 0; i < m_textTracks->length(); ++i) {
</span><ins>+ LOG(Media, " track[%i]->mode = %s", i, String(m_textTracks->item(i)->mode()).utf8().data());
</ins><span class="cx"> if (m_textTracks->item(i)->mode() == TextTrack::showingKeyword()) {
</span><span class="cx"> haveVisibleTextTrack = true;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.cpp (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -234,20 +234,13 @@
</span><span class="cx">
</span><span class="cx"> int CaptionUserPreferences::textTrackSelectionScore(TextTrack* track, HTMLMediaElement*) const
</span><span class="cx"> {
</span><del>- int trackScore = 0;
-
</del><span class="cx"> if (track->kind() != TextTrack::captionsKeyword() && track->kind() != TextTrack::subtitlesKeyword())
</span><del>- return trackScore;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> if (!userPrefersSubtitles() && !userPrefersCaptions())
</span><del>- return trackScore;
</del><ins>+ return 0;
</ins><span class="cx">
</span><del>- if (track->kind() == TextTrack::subtitlesKeyword() && userPrefersSubtitles())
- trackScore = 1;
- else if (track->kind() == TextTrack::captionsKeyword() && userPrefersCaptions())
- trackScore = 1;
-
- return trackScore + textTrackLanguageSelectionScore(track, preferredLanguages());
</del><ins>+ return textTrackLanguageSelectionScore(track, preferredLanguages()) + 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int CaptionUserPreferences::textTrackLanguageSelectionScore(TextTrack* track, const Vector<String>& preferredLanguages) const
</span><span class="lines">@@ -255,13 +248,15 @@
</span><span class="cx"> if (track->language().isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- size_t languageMatchIndex = indexOfBestMatchingLanguageInList(track->language(), preferredLanguages);
</del><ins>+ bool exactMatch;
+ size_t languageMatchIndex = indexOfBestMatchingLanguageInList(track->language(), preferredLanguages, exactMatch);
</ins><span class="cx"> if (languageMatchIndex >= preferredLanguages.size())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Matching a track language is more important than matching track type, so this multiplier must be
</span><span class="cx"> // greater than the maximum value returned by textTrackSelectionScore.
</span><del>- return (preferredLanguages.size() - languageMatchIndex) * 10;
</del><ins>+ int bonus = exactMatch ? 1 : 0;
+ return (preferredLanguages.size() + bonus - languageMatchIndex) * 10;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CaptionUserPreferences::setCaptionsStyleSheetOverride(const String& override)
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -663,9 +663,10 @@
</span><span class="cx"> if (audioTrackLanguage.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><ins>+ bool exactMatch;
</ins><span class="cx"> if (trackHasOnlyForcedSubtitles) {
</span><span class="cx"> languageList.append(audioTrackLanguage);
</span><del>- size_t offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList);
</del><ins>+ size_t offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
</ins><span class="cx">
</span><span class="cx"> // Only consider a forced-only track if it IS in the same language as the primary audio track.
</span><span class="cx"> if (offset)
</span><span class="lines">@@ -674,12 +675,12 @@
</span><span class="cx"> languageList.append(defaultLanguage());
</span><span class="cx">
</span><span class="cx"> // Only enable a text track if the current audio track is NOT in the user's preferred language ...
</span><del>- size_t offset = indexOfBestMatchingLanguageInList(audioTrackLanguage, languageList);
</del><ins>+ size_t offset = indexOfBestMatchingLanguageInList(audioTrackLanguage, languageList, exactMatch);
</ins><span class="cx"> if (!offset)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // and the text track matches the user's preferred language.
</span><del>- offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList);
</del><ins>+ offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
</ins><span class="cx"> if (offset)
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.cpp (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.cpp 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/platform/Language.cpp 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -105,22 +105,25 @@
</span><span class="cx"> return lowercaseLanguageCode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList)
</del><ins>+size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList, bool& exactMatch)
</ins><span class="cx"> {
</span><ins>+ String lowercaseLanguage = language.lower();
</ins><span class="cx"> String languageWithoutLocaleMatch;
</span><span class="cx"> String languageMatchButNotLocale;
</span><span class="cx"> size_t languageWithoutLocaleMatchIndex = 0;
</span><span class="cx"> size_t languageMatchButNotLocaleMatchIndex = 0;
</span><del>- bool canMatchLanguageOnly = (language.length() == 2 || (language.length() >= 3 && language[2] == '-'));
</del><ins>+ bool canMatchLanguageOnly = (lowercaseLanguage.length() == 2 || (lowercaseLanguage.length() >= 3 && lowercaseLanguage[2] == '-'));
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < languageList.size(); ++i) {
</span><span class="cx"> String canonicalizedLanguageFromList = canonicalLanguageIdentifier(languageList[i]);
</span><span class="cx">
</span><del>- if (language == canonicalizedLanguageFromList)
</del><ins>+ if (lowercaseLanguage == canonicalizedLanguageFromList) {
+ exactMatch = true;
</ins><span class="cx"> return i;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (canMatchLanguageOnly && canonicalizedLanguageFromList.length() >= 2) {
</span><del>- if (language[0] == canonicalizedLanguageFromList[0] && language[1] == canonicalizedLanguageFromList[1]) {
</del><ins>+ if (lowercaseLanguage[0] == canonicalizedLanguageFromList[0] && lowercaseLanguage[1] == canonicalizedLanguageFromList[1]) {
</ins><span class="cx"> if (!languageWithoutLocaleMatch.length() && canonicalizedLanguageFromList.length() == 2) {
</span><span class="cx"> languageWithoutLocaleMatch = languageList[i];
</span><span class="cx"> languageWithoutLocaleMatchIndex = i;
</span><span class="lines">@@ -133,6 +136,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ exactMatch = false;
+
</ins><span class="cx"> // If we have both a language-only match and a languge-but-not-locale match, return the
</span><span class="cx"> // languge-only match as is considered a "better" match. For example, if the list
</span><span class="cx"> // provided has both "en-GB" and "en" and the user prefers "en-US" we will return "en".
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.h (183675 => 183676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.h 2015-05-01 16:23:07 UTC (rev 183675)
+++ trunk/Source/WebCore/platform/Language.h 2015-05-01 16:57:38 UTC (rev 183676)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<String> userPreferredLanguages();
</span><span class="cx"> Vector<String> userPreferredLanguagesOverride();
</span><span class="cx"> WEBCORE_EXPORT void overrideUserPreferredLanguages(const Vector<String>&);
</span><del>-size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList);
</del><ins>+size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList, bool& exactMatch);
</ins><span class="cx">
</span><span class="cx"> // The observer function will be called when system language changes.
</span><span class="cx"> typedef void (*LanguageChangeObserverFunction)(void* context);
</span></span></pre>
</div>
</div>
</body>
</html>