Title: [159265] trunk/Source/WebCore
Revision
159265
Author
[email protected]
Date
2013-11-13 17:18:32 -0800 (Wed, 13 Nov 2013)

Log Message

Use NSCalendarIdentifierGregorian instead of NSGregorianCalendar on OS X 10.9 and iOS
https://bugs.webkit.org/show_bug.cgi?id=124323

Reviewed by Mark Rowe.

NSGregorianCalendar was deprecated in OS X 10.9 and iOS 7.

* platform/text/mac/LocaleMac.mm:
(WebCore::LocaleMac::LocaleMac):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (159264 => 159265)


--- trunk/Source/WebCore/ChangeLog	2013-11-14 00:53:18 UTC (rev 159264)
+++ trunk/Source/WebCore/ChangeLog	2013-11-14 01:18:32 UTC (rev 159265)
@@ -1,3 +1,15 @@
+2013-11-13  Andy Estes  <[email protected]>
+
+        Use NSCalendarIdentifierGregorian instead of NSGregorianCalendar on OS X 10.9 and iOS
+        https://bugs.webkit.org/show_bug.cgi?id=124323
+
+        Reviewed by Mark Rowe.
+
+        NSGregorianCalendar was deprecated in OS X 10.9 and iOS 7.
+
+        * platform/text/mac/LocaleMac.mm:
+        (WebCore::LocaleMac::LocaleMac):
+
 2013-11-13  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: Rename InspectorBackendDispatcher.h to InspectorBackendDispatchers.h

Modified: trunk/Source/WebCore/platform/text/mac/LocaleMac.mm (159264 => 159265)


--- trunk/Source/WebCore/platform/text/mac/LocaleMac.mm	2013-11-14 00:53:18 UTC (rev 159264)
+++ trunk/Source/WebCore/platform/text/mac/LocaleMac.mm	2013-11-14 01:18:32 UTC (rev 159265)
@@ -81,7 +81,11 @@
 
 LocaleMac::LocaleMac(NSLocale* locale)
     : m_locale(locale)
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
+#else
     , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
+#endif
     , m_didInitializeNumberData(false)
 {
     NSArray* availableLanguages = [NSLocale ISOLanguageCodes];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to