Clean up singleton implementation

core/fxge/include/fx_ge.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXGE_INCLUDE_FX_GE_H_
 #define CORE_FXGE_INCLUDE_FX_GE_H_
 
 #include <memory>
 
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_font.h"
 
 class CCodec_ModuleMgr;
 class CFX_FaceCache;
 class CFX_Font;
 class CFX_FontCache;
 class CFX_FontMgr;
 class CPDF_ShadingPattern;
 class IFX_RenderDeviceDriver;
 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);
   const uint8_t* GetTextGammaTable() const;
 
   CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule; }
   void* GetPlatformData() { return m_pPlatformData; }
 
   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;
 };
 
 struct FX_PATHPOINT {
   FX_FLOAT m_PointX;
   FX_FLOAT m_PointY;
   int m_Flag;
 };
 
@@ skipping 360 matching lines @@
   bool AttachRecorder(SkPictureRecorder* recorder);
   SkPictureRecorder* CreateRecorder(int size_x, int size_y);
   void DebugVerifyBitmapIsPreMultiplied() const override;
 #endif
 
  protected:
   bool m_bOwnedBitmap;
 };
 
 #endif  // CORE_FXGE_INCLUDE_FX_GE_H_