Title: [195006] trunk/Source/WebCore
- Revision
- 195006
- Author
- mmaxfi...@apple.com
- Date
- 2016-01-13 22:22:24 -0800 (Wed, 13 Jan 2016)
Log Message
Addressing more post-review comments after r194566
Unreviewed.
No new tests because there is no behavior change.
* platform/text/mac/TextBreakIteratorInternalICUMac.mm:
(WebCore::topLanguagePreference):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195005 => 195006)
--- trunk/Source/WebCore/ChangeLog 2016-01-14 02:43:48 UTC (rev 195005)
+++ trunk/Source/WebCore/ChangeLog 2016-01-14 06:22:24 UTC (rev 195006)
@@ -1,3 +1,14 @@
+2016-01-13 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Addressing more post-review comments after r194566
+
+ Unreviewed.
+
+ No new tests because there is no behavior change.
+
+ * platform/text/mac/TextBreakIteratorInternalICUMac.mm:
+ (WebCore::topLanguagePreference):
+
2016-01-13 Alex Christensen <achristen...@webkit.org>
Implement custom protocols when using NetworkSession
Modified: trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm (195005 => 195006)
--- trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm 2016-01-14 02:43:48 UTC (rev 195005)
+++ trunk/Source/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm 2016-01-14 06:22:24 UTC (rev 195006)
@@ -38,13 +38,12 @@
static RetainPtr<CFStringRef> topLanguagePreference()
{
- NSArray *languagesArray = [NSLocale preferredLanguages];
+ RetainPtr<CFArrayRef> languagesArray = adoptCF(CFLocaleCopyPreferredLanguages());
if (!languagesArray)
return nullptr;
- if ([languagesArray count] < 1)
+ if (!CFArrayGetCount(languagesArray.get()))
return nullptr;
- NSString *value = [languagesArray objectAtIndex:0];
- return reinterpret_cast<CFStringRef>(value);
+ return static_cast<CFStringRef>(CFArrayGetValueAtIndex(languagesArray.get(), 0));
}
static void getLocale(CFStringRef locale, char localeStringBuffer[maxLocaleStringLength])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
