Cleanup CXFA_LocaleMgr

This CL cleans up code for the CXFA_LocaleMgr class.

Change-Id: I4a3c9394be021d6605dadd8003c7619b19bb9fc0
Reviewed-on: https://pdfium-review.googlesource.com/29250
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

5 files changed, 64 insertions, 65 deletions

diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp
index 4157c29426..4ad3861dfe 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/cfxjse_formcalc_context.cpp
@@ -16,6 +16,7 @@
 #include "core/fxcrt/cfx_widetextbuf.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_random.h"
+#include "core/fxcrt/locale_iface.h"
 #include "fxjs/cfxjse_class.h"
 #include "fxjs/cfxjse_engine.h"
 #include "fxjs/cfxjse_value.h"
diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp
index d0e8a5dcb8..d0d7db860c 100644
--- a/xfa/fxfa/cxfa_ffnotify.cpp
+++ b/xfa/fxfa/cxfa_ffnotify.cpp
@@ -9,6 +9,7 @@
 #include <memory>
 #include <utility>
 
+#include "core/fxcrt/cfx_datetime.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffarc.h"
 #include "xfa/fxfa/cxfa_ffbarcode.h"
diff --git a/xfa/fxfa/parser/cxfa_localemgr.cpp b/xfa/fxfa/parser/cxfa_localemgr.cpp
index eb810dfc62..277ba38eb9 100644
--- a/xfa/fxfa/parser/cxfa_localemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_localemgr.cpp
@@ -42,6 +42,8 @@
 #define FX_LANG_es_LA 0x080a
 #define FX_LANG_es_ES 0x0c0a
 
+namespace {
+
 // These arrays are the hex encoded XML strings which define the locale.
 // <locale name="en_US" desc="English(America)">
 //   <calendarSymbols name="gregorian">
@@ -1065,8 +1067,8 @@ const uint8_t g_ruRU_Locale[] = {
     0xB3, 0x85, 0xFA, 0x59, 0x2A, 0x7A, 0xFF, 0x3D, 0xC4, 0x3F, 0xDE, 0xCB,
     0x8B, 0xC4};
 
-static std::unique_ptr<LocaleIface> XFA_GetLocaleFromBuffer(const uint8_t* pBuf,
-                                                            int nBufLen) {
+std::unique_ptr<LocaleIface> GetLocaleFromBuffer(const uint8_t* pBuf,
+                                                 int nBufLen) {
   if (!pBuf || nBufLen <= 0)
     return nullptr;
 
@@ -1084,7 +1086,7 @@ static std::unique_ptr<LocaleIface> XFA_GetLocaleFromBuffer(const uint8_t* pBuf,
                  : nullptr;
 }
 
-static uint16_t XFA_GetLanguage(WideString wsLanguage) {
+uint16_t GetLanguage(WideString wsLanguage) {
   if (wsLanguage.GetLength() < 2)
     return FX_LANG_en_US;
 
@@ -1127,25 +1129,22 @@ static uint16_t XFA_GetLanguage(WideString wsLanguage) {
   return FX_LANG_en_US;
 }
 
+}  // namespace
+
 CXFA_LocaleMgr::CXFA_LocaleMgr(CXFA_Node* pLocaleSet, WideString wsDeflcid)
-    : m_dwLocaleFlags(0x00) {
-  m_dwDeflcid = XFA_GetLanguage(wsDeflcid);
-  if (pLocaleSet) {
-    CXFA_Node* pNodeLocale = pLocaleSet->GetFirstChild();
-    while (pNodeLocale) {
-      m_LocaleArray.push_back(pdfium::MakeUnique<CXFA_NodeLocale>(pNodeLocale));
-      pNodeLocale = pNodeLocale->GetNextSibling();
-    }
+    : m_pDefLocale(GetLocaleByName(wsDeflcid)),
+      m_dwDeflcid(GetLanguage(wsDeflcid)) {
+  if (!pLocaleSet)
+    return;
+
+  for (CXFA_Node* pNodeLocale = pLocaleSet->GetFirstChild(); pNodeLocale;
+       pNodeLocale = pNodeLocale->GetNextSibling()) {
+    m_LocaleArray.push_back(pdfium::MakeUnique<CXFA_NodeLocale>(pNodeLocale));
   }
-  m_pDefLocale = GetLocaleByName(wsDeflcid);
 }
 
 CXFA_LocaleMgr::~CXFA_LocaleMgr() {}
 
-uint16_t CXFA_LocaleMgr::GetDefLocaleID() const {
-  return m_dwDeflcid;
-}
-
 LocaleIface* CXFA_LocaleMgr::GetDefLocale() {
   if (m_pDefLocale)
     return m_pDefLocale;
@@ -1167,36 +1166,36 @@ LocaleIface* CXFA_LocaleMgr::GetDefLocale() {
 std::unique_ptr<LocaleIface> CXFA_LocaleMgr::GetLocale(uint16_t lcid) {
   switch (lcid) {
     case FX_LANG_zh_CN:
-      return XFA_GetLocaleFromBuffer(g_zhCN_Locale, sizeof(g_zhCN_Locale));
+      return GetLocaleFromBuffer(g_zhCN_Locale, sizeof(g_zhCN_Locale));
     case FX_LANG_zh_TW:
-      return XFA_GetLocaleFromBuffer(g_zhTW_Locale, sizeof(g_zhTW_Locale));
+      return GetLocaleFromBuffer(g_zhTW_Locale, sizeof(g_zhTW_Locale));
     case FX_LANG_zh_HK:
-      return XFA_GetLocaleFromBuffer(g_zhHK_Locale, sizeof(g_zhHK_Locale));
+      return GetLocaleFromBuffer(g_zhHK_Locale, sizeof(g_zhHK_Locale));
     case FX_LANG_ja_JP:
-      return XFA_GetLocaleFromBuffer(g_jaJP_Locale, sizeof(g_jaJP_Locale));
+      return GetLocaleFromBuffer(g_jaJP_Locale, sizeof(g_jaJP_Locale));
     case FX_LANG_ko_KR:
-      return XFA_GetLocaleFromBuffer(g_koKR_Locale, sizeof(g_koKR_Locale));
+      return GetLocaleFromBuffer(g_koKR_Locale, sizeof(g_koKR_Locale));
     case FX_LANG_en_GB:
-      return XFA_GetLocaleFromBuffer(g_enGB_Locale, sizeof(g_enGB_Locale));
+      return GetLocaleFromBuffer(g_enGB_Locale, sizeof(g_enGB_Locale));
     case FX_LANG_es_LA:
-      return XFA_GetLocaleFromBuffer(g_esLA_Locale, sizeof(g_esLA_Locale));
+      return GetLocaleFromBuffer(g_esLA_Locale, sizeof(g_esLA_Locale));
     case FX_LANG_es_ES:
-      return XFA_GetLocaleFromBuffer(g_esES_Locale, sizeof(g_esES_Locale));
+      return GetLocaleFromBuffer(g_esES_Locale, sizeof(g_esES_Locale));
     case FX_LANG_de_DE:
-      return XFA_GetLocaleFromBuffer(g_deDE_Loacale, sizeof(g_deDE_Loacale));
+      return GetLocaleFromBuffer(g_deDE_Loacale, sizeof(g_deDE_Loacale));
     case FX_LANG_fr_FR:
-      return XFA_GetLocaleFromBuffer(g_frFR_Locale, sizeof(g_frFR_Locale));
+      return GetLocaleFromBuffer(g_frFR_Locale, sizeof(g_frFR_Locale));
     case FX_LANG_it_IT:
-      return XFA_GetLocaleFromBuffer(g_itIT_Locale, sizeof(g_itIT_Locale));
+      return GetLocaleFromBuffer(g_itIT_Locale, sizeof(g_itIT_Locale));
     case FX_LANG_pt_BR:
-      return XFA_GetLocaleFromBuffer(g_ptBR_Locale, sizeof(g_ptBR_Locale));
+      return GetLocaleFromBuffer(g_ptBR_Locale, sizeof(g_ptBR_Locale));
     case FX_LANG_nl_NL:
-      return XFA_GetLocaleFromBuffer(g_nlNL_Locale, sizeof(g_nlNL_Locale));
+      return GetLocaleFromBuffer(g_nlNL_Locale, sizeof(g_nlNL_Locale));
     case FX_LANG_ru_RU:
-      return XFA_GetLocaleFromBuffer(g_ruRU_Locale, sizeof(g_ruRU_Locale));
+      return GetLocaleFromBuffer(g_ruRU_Locale, sizeof(g_ruRU_Locale));
     case FX_LANG_en_US:
     default:
-      return XFA_GetLocaleFromBuffer(g_enUS_Locale, sizeof(g_enUS_Locale));
+      return GetLocaleFromBuffer(g_enUS_Locale, sizeof(g_enUS_Locale));
   }
 }
 
@@ -1214,8 +1213,7 @@ LocaleIface* CXFA_LocaleMgr::GetLocaleByName(const WideString& wsLocaleName) {
       return pLocale;
   }
 
-  std::unique_ptr<LocaleIface> pLocale(
-      GetLocale(XFA_GetLanguage(wsLocaleName)));
+  std::unique_ptr<LocaleIface> pLocale(GetLocale(GetLanguage(wsLocaleName)));
   LocaleIface* pRetLocale = pLocale.get();
   if (pLocale)
     m_XMLLocaleArray.push_back(std::move(pLocale));
@@ -1226,31 +1224,32 @@ void CXFA_LocaleMgr::SetDefLocale(LocaleIface* pLocale) {
   m_pDefLocale = pLocale;
 }
 
-WideStringView CXFA_LocaleMgr::GetConfigLocaleName(CXFA_Node* pConfig) {
-  if (!(m_dwLocaleFlags & 0x01)) {
-    m_wsConfigLocale.clear();
-    if (pConfig) {
-      CXFA_Node* pChildfConfig =
-          pConfig->GetFirstChildByClass<CXFA_Acrobat>(XFA_Element::Acrobat);
-      if (!pChildfConfig) {
-        pChildfConfig =
-            pConfig->GetFirstChildByClass<CXFA_Present>(XFA_Element::Present);
-      }
-      CXFA_Common* pCommon =
-          pChildfConfig ? pChildfConfig->GetFirstChildByClass<CXFA_Common>(
-                              XFA_Element::Common)
-                        : nullptr;
-      CXFA_Locale* pLocale =
-          pCommon
-              ? pCommon->GetFirstChildByClass<CXFA_Locale>(XFA_Element::Locale)
+WideString CXFA_LocaleMgr::GetConfigLocaleName(CXFA_Node* pConfig) {
+  if (m_hasSetLocaleName)
+    return m_wsConfigLocale;
+
+  m_hasSetLocaleName = true;
+  m_wsConfigLocale = L"";
+  if (!pConfig)
+    return m_wsConfigLocale;
+
+  CXFA_Node* pChildfConfig =
+      pConfig->GetFirstChildByClass<CXFA_Acrobat>(XFA_Element::Acrobat);
+  if (!pChildfConfig) {
+    pChildfConfig =
+        pConfig->GetFirstChildByClass<CXFA_Present>(XFA_Element::Present);
+  }
+  CXFA_Common* pCommon = pChildfConfig
+                             ? pChildfConfig->GetFirstChildByClass<CXFA_Common>(
+                                   XFA_Element::Common)
+                             : nullptr;
+  CXFA_Locale* pLocale =
+      pCommon ? pCommon->GetFirstChildByClass<CXFA_Locale>(XFA_Element::Locale)
               : nullptr;
-      if (pLocale) {
-        m_wsConfigLocale = pLocale->JSObject()
-                               ->TryCData(XFA_Attribute::Value, false)
-                               .value_or(WideString());
-      }
-    }
-    m_dwLocaleFlags |= 0x01;
+  if (pLocale) {
+    m_wsConfigLocale = pLocale->JSObject()
+                           ->TryCData(XFA_Attribute::Value, false)
+                           .value_or(WideString());
   }
-  return m_wsConfigLocale.AsStringView();
+  return m_wsConfigLocale;
 }
diff --git a/xfa/fxfa/parser/cxfa_localemgr.h b/xfa/fxfa/parser/cxfa_localemgr.h
index b56a4aeead..c72e23ab5a 100644
--- a/xfa/fxfa/parser/cxfa_localemgr.h
+++ b/xfa/fxfa/parser/cxfa_localemgr.h
@@ -10,9 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/cfx_datetime.h"
-#include "core/fxcrt/locale_iface.h"
-#include "xfa/fxfa/parser/cxfa_localemgr.h"
+#include "core/fxcrt/widestring.h"
 
 class CXFA_Node;
 class LocaleIface;
@@ -22,12 +20,11 @@ class CXFA_LocaleMgr {
   CXFA_LocaleMgr(CXFA_Node* pLocaleSet, WideString wsDeflcid);
   ~CXFA_LocaleMgr();
 
-  uint16_t GetDefLocaleID() const;
   LocaleIface* GetDefLocale();
   LocaleIface* GetLocaleByName(const WideString& wsLocaleName);
 
   void SetDefLocale(LocaleIface* pLocale);
-  WideStringView GetConfigLocaleName(CXFA_Node* pConfig);
+  WideString GetConfigLocaleName(CXFA_Node* pConfig);
 
  private:
   std::unique_ptr<LocaleIface> GetLocale(uint16_t lcid);
@@ -37,7 +34,7 @@ class CXFA_LocaleMgr {
   LocaleIface* m_pDefLocale;  // owned by m_LocaleArray or m_XMLLocaleArray.
   WideString m_wsConfigLocale;
   uint16_t m_dwDeflcid;
-  uint16_t m_dwLocaleFlags;
+  bool m_hasSetLocaleName = false;
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_LOCALEMGR_H_
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 508fb072b0..505de1c849 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -19,6 +19,7 @@
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_fallthrough.h"
+#include "core/fxcrt/locale_iface.h"
 #include "core/fxcrt/xml/cfx_xmlelement.h"
 #include "core/fxcrt/xml/cfx_xmlnode.h"
 #include "core/fxcrt/xml/cfx_xmltext.h"
@@ -940,7 +941,7 @@ Optional<WideString> CXFA_Node::GetLocaleName() {
 
   CXFA_Node* pConfig = ToNode(GetDocument()->GetXFAObject(XFA_HASHCODE_Config));
   Optional<WideString> localeName = {
-      WideString(GetDocument()->GetLocalMgr()->GetConfigLocaleName(pConfig))};
+      GetDocument()->GetLocalMgr()->GetConfigLocaleName(pConfig)};
   if (localeName && !localeName->IsEmpty())
     return localeName;