Title: [254618] branches/safari-609-branch/Source/WTF
- Revision
- 254618
- Author
- alanc...@apple.com
- Date
- 2020-01-15 11:16:16 -0800 (Wed, 15 Jan 2020)
Log Message
Cherry-pick r254411. rdar://problem/58548648
Fix internal Apple builds after r254389
https://bugs.webkit.org/show_bug.cgi?id=206135
Rubber stamped by Zalan Bujtas.
* wtf/spi/cocoa/NSLocaleSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WTF/ChangeLog (254617 => 254618)
--- branches/safari-609-branch/Source/WTF/ChangeLog 2020-01-15 19:16:14 UTC (rev 254617)
+++ branches/safari-609-branch/Source/WTF/ChangeLog 2020-01-15 19:16:16 UTC (rev 254618)
@@ -1,5 +1,28 @@
2020-01-15 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254411. rdar://problem/58548648
+
+ Fix internal Apple builds after r254389
+ https://bugs.webkit.org/show_bug.cgi?id=206135
+
+ Rubber stamped by Zalan Bujtas.
+
+ * wtf/spi/cocoa/NSLocaleSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-11 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Fix internal Apple builds after r254389
+ https://bugs.webkit.org/show_bug.cgi?id=206135
+
+ Rubber stamped by Zalan Bujtas.
+
+ * wtf/spi/cocoa/NSLocaleSPI.h:
+
+2020-01-15 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254389. rdar://problem/58548648
REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
Modified: branches/safari-609-branch/Source/WTF/wtf/spi/cocoa/NSLocaleSPI.h (254617 => 254618)
--- branches/safari-609-branch/Source/WTF/wtf/spi/cocoa/NSLocaleSPI.h 2020-01-15 19:16:14 UTC (rev 254617)
+++ branches/safari-609-branch/Source/WTF/wtf/spi/cocoa/NSLocaleSPI.h 2020-01-15 19:16:16 UTC (rev 254618)
@@ -25,14 +25,13 @@
#import <Foundation/Foundation.h>
-#if PLATFORM(MAC) && USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK)
#import <InternationalSupport/NSLocale+InternationalSupportExtensions.h>
-#else
+#endif
@interface NSLocale ()
+ (nonnull NSArray<NSString *> *)minimizedLanguagesFromLanguages:(nonnull NSArray<NSString *> *)languages;
@end
-#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
