From 379045003371fb4efc543622c2ad4b375934aee0 Mon Sep 17 00:00:00 2001
From: Dan Minor <dminor@mozilla.com>
Date: Tue, 27 Oct 2020 20:45:17 +0000
Subject: [PATCH] Bug 1426907 - Make OSPreferences::GetPatternForSkeleton
 public and use in DateTimeFormat; r=zbraniecki

This allows for the removal of duplicated code between DateTimeFormat and
OSPreferences.

Differential Revision: https://phabricator.services.mozilla.com/D94432
---
 intl/locale/DateTimeFormat.cpp | 26 +++-----------------------
 intl/locale/OSPreferences.h    |  7 ++++---
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/intl/locale/DateTimeFormat.cpp b/intl/locale/DateTimeFormat.cpp
index 51a547d9b6ab..3c87f95452f1 100644
--- a/intl/locale/DateTimeFormat.cpp
+++ b/intl/locale/DateTimeFormat.cpp
@@ -74,8 +74,6 @@ nsresult DateTimeFormat::FormatDateTime(
   UErrorCode status = U_ZERO_ERROR;
 
   nsAutoString skeleton;
-  nsAutoString pattern;
-
   switch (aSkeleton) {
     case Skeleton::yyyyMM:
       skeleton.AssignASCII("yyyyMM");
@@ -87,28 +85,10 @@ nsresult DateTimeFormat::FormatDateTime(
       MOZ_ASSERT_UNREACHABLE("Unhandled skeleton enum");
   }
 
-  UDateTimePatternGenerator* patternGenerator =
-      udatpg_open(mLocale->get(), &status);
-  if (U_SUCCESS(status)) {
-    int32_t patternLength;
-    pattern.SetLength(DATETIME_FORMAT_INITIAL_LEN);
-    patternLength = udatpg_getBestPattern(
-        patternGenerator,
-        reinterpret_cast<const UChar*>(skeleton.BeginReading()),
-        skeleton.Length(), reinterpret_cast<UChar*>(pattern.BeginWriting()),
-        DATETIME_FORMAT_INITIAL_LEN, &status);
-    pattern.SetLength(patternLength);
-
-    if (status == U_BUFFER_OVERFLOW_ERROR) {
-      status = U_ZERO_ERROR;
-      udatpg_getBestPattern(
-          patternGenerator,
-          reinterpret_cast<const UChar*>(skeleton.BeginReading()),
-          skeleton.Length(), reinterpret_cast<UChar*>(pattern.BeginWriting()),
-          patternLength, &status);
-    }
+  nsAutoString pattern;
+  if (!OSPreferences::GetPatternForSkeleton(skeleton, *mLocale, pattern)) {
+    return NS_ERROR_FAILURE;
   }
-  udatpg_close(patternGenerator);
 
   nsAutoString timeZoneID;
   BuildTimeZoneString(aExplodedTime->tm_params, timeZoneID);
diff --git a/intl/locale/OSPreferences.h b/intl/locale/OSPreferences.h
index dc327cc7d006..96fe7bcbc6ca 100644
--- a/intl/locale/OSPreferences.h
+++ b/intl/locale/OSPreferences.h
@@ -77,6 +77,10 @@ class OSPreferences : public mozIOSPreferences {
     return RefPtr<OSPreferences>(GetInstance()).forget();
   }
 
+  static bool GetPatternForSkeleton(const nsAString& aSkeleton,
+                                    const nsACString& aLocale,
+                                    nsAString& aRetVal);
+
   static bool GetDateTimeConnectorPattern(const nsACString& aLocale,
                                           nsAString& aRetVal);
 
@@ -121,9 +125,6 @@ class OSPreferences : public mozIOSPreferences {
                                    const nsACString& aLocale,
                                    nsAString& aRetVal);
 
-  bool GetPatternForSkeleton(const nsAString& aSkeleton,
-                             const nsACString& aLocale, nsAString& aRetVal);
-
   /**
    * This is a host environment specific method that will be implemented
    * separately for each platform.