Title: [195001] trunk/Source/WebCore
- Revision
- 195001
- Author
- mmaxfi...@apple.com
- Date
- 2016-01-13 16:29:55 -0800 (Wed, 13 Jan 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195000 => 195001)
--- 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)
@@ -1,3 +1,18 @@
+2016-01-13 Myles C. Maxfield <mmaxfi...@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.
+
2016-01-12 Ryosuke Niwa <rn...@webkit.org>
formaction must return document's address when formaction is missing
Modified: trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm (195000 => 195001)
--- 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)
@@ -32,7 +32,7 @@
RetainPtr<CFPropertyListRef> locale = adoptCF(CFPreferencesCopyValue(CFSTR("AppleTextBreakLocale"),
kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
if (!locale || CFGetTypeID(locale.get()) != CFStringGetTypeID())
- return 0;
+ return nullptr;
return static_cast<CFStringRef>(locale.get());
}
@@ -40,25 +40,13 @@
{
NSArray *languagesArray = [NSLocale preferredLanguages];
if (!languagesArray)
- return 0;
+ return nullptr;
if ([languagesArray count] < 1)
- return 0;
+ return nullptr;
NSString *value = [languagesArray objectAtIndex:0];
- if (![value isKindOfClass:[NSString class]])
- return 0;
return reinterpret_cast<CFStringRef>(value);
}
-static RetainPtr<CFStringRef> canonicalLanguageIdentifier(CFStringRef locale)
-{
- if (!locale)
- return 0;
- RetainPtr<CFStringRef> canonicalLocale = adoptCF(CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, locale));
- if (!canonicalLocale)
- return locale;
- return canonicalLocale;
-}
-
static void getLocale(CFStringRef locale, char localeStringBuffer[maxLocaleStringLength])
{
// Empty string means "root locale", and that is what we use if we can't get a preference.
@@ -70,7 +58,7 @@
static void getSearchLocale(char localeStringBuffer[maxLocaleStringLength])
{
- getLocale(canonicalLanguageIdentifier(topLanguagePreference().get()).get(), localeStringBuffer);
+ getLocale(topLanguagePreference().get(), localeStringBuffer);
}
const char* currentSearchLocaleID()
@@ -88,9 +76,12 @@
{
// If there is no text break locale, use the top language preference.
RetainPtr<CFStringRef> locale = textBreakLocalePreference();
- if (!locale)
+ if (locale) {
+ if (RetainPtr<CFStringRef> canonicalLocale = adoptCF(CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, locale.get())))
+ locale = canonicalLocale;
+ } else
locale = topLanguagePreference();
- getLocale(canonicalLanguageIdentifier(locale.get()).get(), localeStringBuffer);
+ getLocale(locale.get(), localeStringBuffer);
}
const char* currentTextBreakLocaleID()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
