Clean up singleton implementation

core/fxge/include/fx_ge.h

Index: core/fxge/include/fx_ge.h
diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h
index ea2adec1dc3e19463cfd7782046004f109b1e474..8c53d3d82149aef76afc4b9537df6eaa8a97d6d0 100644
--- a/core/fxge/include/fx_ge.h
+++ b/core/fxge/include/fx_ge.h
@@ -23,11 +23,10 @@ class SkPictureRecorder;
 
 class CFX_GEModule {
  public:
-  static void Create(const char** pUserFontPaths,
-                     CCodec_ModuleMgr* pCodecModule);
   static CFX_GEModule* Get();
   static void Destroy();
 
+  void Init(const char** pUserFontPaths, CCodec_ModuleMgr* pCodecModule);
   CFX_FontCache* GetFontCache();
   CFX_FontMgr* GetFontMgr() { return m_pFontMgr.get(); }
   void SetTextGamma(FX_FLOAT gammaValue);
@@ -39,16 +38,18 @@ class CFX_GEModule {
   FXFT_Library m_FTLibrary;
 
  private:
-  CFX_GEModule(const char** pUserFontPaths, CCodec_ModuleMgr* pCodecModule);
+  CFX_GEModule();
   ~CFX_GEModule();
 
   void InitPlatform();
   void DestroyPlatform();
 
+  static CFX_GEModule* m_pGEModule;

[Lei Zhang, 2016/07/16 01:23:03]

Leave as a global, for the same reason as CPDFXFA_App.

[Wei Li, 2016/07/18 19:07:07]

Same here.

+
   uint8_t m_GammaValue[256];
   CFX_FontCache* m_pFontCache;
   std::unique_ptr<CFX_FontMgr> m_pFontMgr;
-  CCodec_ModuleMgr* const m_pCodecModule;
+  CCodec_ModuleMgr* m_pCodecModule;
   void* m_pPlatformData;
   const char** m_pUserFontPaths;
 };