<!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>[195001] 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/195001">195001</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 16:29:55 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Addressing post-review comments after <a href="http://trac.webkit.org/projects/webkit/changeset/194566">r194566</a>
Unreviewed.
No new tests because there is no behavior difference.
* platform/text/mac/TextBreakIteratorInternalICUMac.mm:
(WebCore::textBreakLocalePreference):
(WebCore::topLanguagePreference):
(WebCore::getSearchLocale):
(WebCore::getTextBreakLocale):
(WebCore::canonicalLanguageIdentifier): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacTextBreakIteratorInternalICUMacmm">trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195000 => 195001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-14 00:28:40 UTC (rev 195000)
+++ trunk/Source/WebCore/ChangeLog 2016-01-14 00:29:55 UTC (rev 195001)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments after r194566
+
+ Unreviewed.
+
+ No new tests because there is no behavior difference.
+
+ * platform/text/mac/TextBreakIteratorInternalICUMac.mm:
+ (WebCore::textBreakLocalePreference):
+ (WebCore::topLanguagePreference):
+ (WebCore::getSearchLocale):
+ (WebCore::getTextBreakLocale):
+ (WebCore::canonicalLanguageIdentifier): Deleted.
+
</ins><span class="cx"> 2016-01-12 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> formaction must return document's address when formaction is missing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacTextBreakIteratorInternalICUMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm (195000 => 195001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm 2016-01-14 00:28:40 UTC (rev 195000)
+++ trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm 2016-01-14 00:29:55 UTC (rev 195001)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> RetainPtr<CFPropertyListRef> locale = adoptCF(CFPreferencesCopyValue(CFSTR("AppleTextBreakLocale"),
</span><span class="cx"> kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
</span><span class="cx"> if (!locale || CFGetTypeID(locale.get()) != CFStringGetTypeID())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return static_cast<CFStringRef>(locale.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -40,25 +40,13 @@
</span><span class="cx"> {
</span><span class="cx"> NSArray *languagesArray = [NSLocale preferredLanguages];
</span><span class="cx"> if (!languagesArray)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if ([languagesArray count] < 1)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> NSString *value = [languagesArray objectAtIndex:0];
</span><del>- if (![value isKindOfClass:[NSString class]])
- return 0;
</del><span class="cx"> return reinterpret_cast<CFStringRef>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RetainPtr<CFStringRef> canonicalLanguageIdentifier(CFStringRef locale)
-{
- if (!locale)
- return 0;
- RetainPtr<CFStringRef> canonicalLocale = adoptCF(CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, locale));
- if (!canonicalLocale)
- return locale;
- return canonicalLocale;
-}
-
</del><span class="cx"> static void getLocale(CFStringRef locale, char localeStringBuffer[maxLocaleStringLength])
</span><span class="cx"> {
</span><span class="cx"> // Empty string means "root locale", and that is what we use if we can't get a preference.
</span><span class="lines">@@ -70,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> static void getSearchLocale(char localeStringBuffer[maxLocaleStringLength])
</span><span class="cx"> {
</span><del>- getLocale(canonicalLanguageIdentifier(topLanguagePreference().get()).get(), localeStringBuffer);
</del><ins>+ getLocale(topLanguagePreference().get(), localeStringBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* currentSearchLocaleID()
</span><span class="lines">@@ -88,9 +76,12 @@
</span><span class="cx"> {
</span><span class="cx"> // If there is no text break locale, use the top language preference.
</span><span class="cx"> RetainPtr<CFStringRef> locale = textBreakLocalePreference();
</span><del>- if (!locale)
</del><ins>+ if (locale) {
+ if (RetainPtr<CFStringRef> canonicalLocale = adoptCF(CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, locale.get())))
+ locale = canonicalLocale;
+ } else
</ins><span class="cx"> locale = topLanguagePreference();
</span><del>- getLocale(canonicalLanguageIdentifier(locale.get()).get(), localeStringBuffer);
</del><ins>+ getLocale(locale.get(), localeStringBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* currentTextBreakLocaleID()
</span></span></pre>
</div>
</div>
</body>
</html>