From 47228aceb86744f858ab8bfa98f3f8b62054dfae Mon Sep 17 00:00:00 2001
From: weili <weili@chromium.org>
Date: Wed, 20 Jul 2016 10:35:31 -0700
Subject: Clean up singleton implementation

Move the singleton instances into their namespaces, and use
get()/getInstance() for uniform accesses.

Review-Url: https://codereview.chromium.org/2154843002
---
 core/fxge/ge/fx_ge.cpp | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'core/fxge/ge/fx_ge.cpp')

diff --git a/core/fxge/ge/fx_ge.cpp b/core/fxge/ge/fx_ge.cpp
index 4ebf812f12..fe0cc2c3eb 100644
--- a/core/fxge/ge/fx_ge.cpp
+++ b/core/fxge/ge/fx_ge.cpp
@@ -8,34 +8,29 @@
 
 #include "core/fxge/ge/fx_text_int.h"
 
-static CFX_GEModule* g_pGEModule = nullptr;
+namespace {
 
-CFX_GEModule::CFX_GEModule(const char** pUserFontPaths,
-                           CCodec_ModuleMgr* pCodecModule)
+CFX_GEModule* g_pGEModule = nullptr;
+
+}  // namespace
+
+CFX_GEModule::CFX_GEModule()
     : m_FTLibrary(nullptr),
       m_pFontCache(nullptr),
       m_pFontMgr(new CFX_FontMgr),
-      m_pCodecModule(pCodecModule),
+      m_pCodecModule(nullptr),
       m_pPlatformData(nullptr),
-      m_pUserFontPaths(pUserFontPaths) {
-  InitPlatform();
-  SetTextGamma(2.2f);
-}
+      m_pUserFontPaths(nullptr) {}
 
 CFX_GEModule::~CFX_GEModule() {
   delete m_pFontCache;
   DestroyPlatform();
 }
 
-// static
-void CFX_GEModule::Create(const char** userFontPaths,
-                          CCodec_ModuleMgr* pCodecModule) {
-  ASSERT(!g_pGEModule);
-  g_pGEModule = new CFX_GEModule(userFontPaths, pCodecModule);
-}
-
 // static
 CFX_GEModule* CFX_GEModule::Get() {
+  if (!g_pGEModule)
+    g_pGEModule = new CFX_GEModule();
   return g_pGEModule;
 }
 
@@ -46,6 +41,15 @@ void CFX_GEModule::Destroy() {
   g_pGEModule = nullptr;
 }
 
+void CFX_GEModule::Init(const char** userFontPaths,
+                        CCodec_ModuleMgr* pCodecModule) {
+  ASSERT(g_pGEModule);
+  m_pCodecModule = pCodecModule;
+  m_pUserFontPaths = userFontPaths;
+  InitPlatform();
+  SetTextGamma(2.2f);
+}
+
 CFX_FontCache* CFX_GEModule::GetFontCache() {
   if (!m_pFontCache)
     m_pFontCache = new CFX_FontCache();
-- 
cgit v1.2.3