Bug 1299615 - Part 6: Update ICU stub implementations for ICU 58. r=Waldo
authorAndré Bargull <andre.bargull@gmail.com>
Thu, 27 Oct 2016 15:41:13 -0700
changeset 351339 9c8727f367c571c83ffea40170a41401792956e9
parent 351338 541e579e59b3213eec4a8e41d7c3522eb5321a68
child 351340 a3cc99e3ff2427b7e24c7e62aa7d9dc83e01b7e5
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs1299615
milestone52.0a1
Bug 1299615 - Part 6: Update ICU stub implementations for ICU 58. r=Waldo
js/src/builtin/Intl.cpp
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -475,18 +475,20 @@ enum UDateFormatField {
     UDAT_QUARTER_FIELD = 27,
     UDAT_STANDALONE_QUARTER_FIELD = 28,
     UDAT_TIMEZONE_SPECIAL_FIELD = 29,
     UDAT_YEAR_NAME_FIELD = 30,
     UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31,
     UDAT_TIMEZONE_ISO_FIELD = 32,
     UDAT_TIMEZONE_ISO_LOCAL_FIELD = 33,
     UDAT_RELATED_YEAR_FIELD = 34,
-    UDAT_TIME_SEPARATOR_FIELD = 35,
-    UDAT_FIELD_COUNT = 36
+    UDAT_AM_PM_MIDNIGHT_NOON_FIELD = 35,
+    UDAT_FLEXIBLE_DAY_PERIOD_FIELD = 36,
+    UDAT_TIME_SEPARATOR_FIELD = 37,
+    UDAT_FIELD_COUNT = 38
 };
 
 enum UDateFormatStyle {
     UDAT_PATTERN = -2,
     UDAT_IGNORE = UDAT_PATTERN
 };
 
 static int32_t
@@ -2370,16 +2372,20 @@ GetFieldTypeForFormatField(UDateFormatFi
       case UDAT_TIMEZONE_SPECIAL_FIELD:
       case UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD:
       case UDAT_TIMEZONE_ISO_FIELD:
       case UDAT_TIMEZONE_ISO_LOCAL_FIELD:
 #ifndef U_HIDE_INTERNAL_API
       case UDAT_RELATED_YEAR_FIELD:
 #endif
 #ifndef U_HIDE_DRAFT_API
+      case UDAT_AM_PM_MIDNIGHT_NOON_FIELD:
+      case UDAT_FLEXIBLE_DAY_PERIOD_FIELD:
+#endif
+#ifndef U_HIDE_INTERNAL_API
       case UDAT_TIME_SEPARATOR_FIELD:
 #endif
         // These fields are all unsupported.
         return nullptr;
 
       case UDAT_FIELD_COUNT:
         MOZ_ASSERT_UNREACHABLE("format field sentinel value returned by "
                                "iterator!");