2 files changed, 50 insertions, 31 deletions
diff --git a/core/fxge/include/cfx_gemodule.h b/core/fxge/include/cfx_gemodule.h
new file mode 100644
index 0000000000..e6b46de8bc
--- /dev/null
+++ b/core/fxge/include/cfx_gemodule.h
@@ -0,0 +1,50 @@
+// 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_CFX_GEMODULE_H_
+#define CORE_FXGE_INCLUDE_CFX_GEMODULE_H_
+
+#include <memory>
+
+#include "core/fxge/include/cfx_fontmgr.h"
+#include "core/fxge/include/fx_font.h"
+
+class CCodec_ModuleMgr;
+class CFX_FontCache;
+class CFX_FontMgr;
+
+class CFX_GEModule {
+ public:
+  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();
+  ~CFX_GEModule();
+
+  void InitPlatform();
+  void DestroyPlatform();
+
+  uint8_t m_GammaValue[256];
+  CFX_FontCache* m_pFontCache;
+  std::unique_ptr<CFX_FontMgr> m_pFontMgr;
+  CCodec_ModuleMgr* m_pCodecModule;
+  void* m_pPlatformData;
+  const char** m_pUserFontPaths;
+};
+
+#endif  // CORE_FXGE_INCLUDE_CFX_GEMODULE_H_
diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h
index 1550ee960e..53c6ccb744 100644
--- a/core/fxge/include/fx_ge.h
+++ b/core/fxge/include/fx_ge.h
@@ -22,37 +22,6 @@ class CPDF_ShadingPattern;
 class IFX_RenderDeviceDriver;
 class SkPictureRecorder;
 
-class CFX_GEModule {
- public:
-  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();
-  ~CFX_GEModule();
-
-  void InitPlatform();
-  void DestroyPlatform();
-
-  uint8_t m_GammaValue[256];
-  CFX_FontCache* m_pFontCache;
-  std::unique_ptr<CFX_FontMgr> m_pFontMgr;
-  CCodec_ModuleMgr* m_pCodecModule;
-  void* m_pPlatformData;
-  const char** m_pUserFontPaths;
-};
-
 struct FX_PATHPOINT {
   FX_FLOAT m_PointX;
   FX_FLOAT m_PointY;