diff options
33 files changed, 83 insertions, 37 deletions
@@ -732,7 +732,7 @@ static_library("fxge") { "core/fxge/ge/cfx_folderfontinfo.h", "core/fxge/ge/cfx_fontmapper.cpp", "core/fxge/ge/cfx_fontmgr.cpp", - "core/fxge/ge/fx_ge.cpp", + "core/fxge/ge/cfx_gemodule.cpp", "core/fxge/ge/fx_ge_device.cpp", "core/fxge/ge/fx_ge_font.cpp", "core/fxge/ge/fx_ge_fontmap.cpp", @@ -744,6 +744,7 @@ static_library("fxge") { "core/fxge/ge/include/cfx_fontmgr.h", "core/fxge/ge/include/ifx_systemfontinfo.h", "core/fxge/ifx_renderdevicedriver.cpp", + "core/fxge/include/cfx_gemodule.h", "core/fxge/include/cfx_windowsdevice.h", "core/fxge/include/fx_dib.h", "core/fxge/include/fx_font.h", diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp index 6a8baa4687..a7322b8f56 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp @@ -8,6 +8,7 @@ #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_freetype.h" #include "core/fxge/include/fx_ge.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index cc9c751b32..f1c204db0c 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -22,6 +22,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" namespace { diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index 038637926c..f5bf76a80c 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -12,6 +12,7 @@ #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" #include "core/fxge/include/ifx_renderdevicedriver.h" #include "third_party/agg23/agg_conv_dash.h" diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index e4a830ff65..a6bddc7117 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -13,6 +13,7 @@ #include "core/fxge/android/fpf_skiamodule.h" #include "core/fxge/android/fx_android_font.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" void CFX_GEModule::InitPlatform() { diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index a3665efe70..f8aba28e86 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -17,6 +17,7 @@ #include "core/fxge/apple/cfx_quartzdevice.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_freetype.h" #ifndef _SKIA_SUPPORT_ diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index de808d80f6..a14bd022ab 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -6,6 +6,7 @@ #include "core/fxge/apple/apple_int.h" #include "core/fxge/ge/cfx_folderfontinfo.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" #include "core/fxge/include/ifx_systemfontinfo.h" diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 966f0bd26d..e3cca4cafa 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_freetype.h" #include "core/fxge/include/fx_ge.h" diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp index 04387db6b4..e255053d59 100644 --- a/core/fxge/dib/fx_dib_composite.cpp +++ b/core/fxge/dib/fx_dib_composite.cpp @@ -6,6 +6,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/dib/dib_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" namespace { diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 4c294adf5f..a9a1056a3d 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -11,6 +11,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/dib/dib_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" void CmykDecode(uint32_t cmyk, int& c, int& m, int& y, int& k) { diff --git a/core/fxge/ge/fx_ge.cpp b/core/fxge/ge/cfx_gemodule.cpp index 0a1b1ab041..98649a1c6e 100644 --- a/core/fxge/ge/fx_ge.cpp +++ b/core/fxge/ge/cfx_gemodule.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/ge/cfx_folderfontinfo.h" #include "core/fxge/ge/fx_text_int.h" diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp index bbbe10adb8..4d3328551f 100644 --- a/core/fxge/ge/fx_ge_font.cpp +++ b/core/fxge/ge/fx_ge_font.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fxge/include/cfx_fontmgr.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_freetype.h" -#include "core/fxge/include/fx_ge.h" #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp index d5a1d956cd..642bbc4561 100644 --- a/core/fxge/ge/fx_ge_linux.cpp +++ b/core/fxge/ge/fx_ge_linux.cpp @@ -12,7 +12,7 @@ #include "core/fxge/ge/cfx_folderfontinfo.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/ifx_systemfontinfo.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index eb6aafd5c6..b3c234f45a 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -10,6 +10,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_fontmgr.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_freetype.h" #include "core/fxge/include/fx_ge.h" #include "core/fxge/include/ifx_renderdevicedriver.h" 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; diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index df20203820..3ccfd14d73 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/skia/fx_skia_device.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 20b277e3f7..cb1243fbd2 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -24,6 +24,7 @@ #include "core/fxge/ge/cfx_folderfontinfo.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_fontmapper.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_windowsdevice.h" #include "core/fxge/include/ifx_systemfontinfo.h" #include "core/fxge/include/fx_font.h" diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp index 8f223a3f06..20a84a2eb7 100644 --- a/core/fxge/win32/fx_win32_dib.cpp +++ b/core/fxge/win32/fx_win32_dib.cpp @@ -9,6 +9,7 @@ #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <windows.h> +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/win32/cfx_windowsdib.h" #include "core/fxge/win32/win32_int.h" diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index 6a70425df7..d21043cdf1 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -17,6 +17,7 @@ using std::max; #include <gdiplus.h> +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/win32/cfx_windowsdib.h" #include "core/fxge/win32/win32_int.h" diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index 48896b0934..996a17a6b7 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -10,7 +10,7 @@ #include "core/fxge/include/cfx_fontmapper.h" #include "core/fxge/include/cfx_fontmgr.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_gemodule.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/include/fsdk_mgr.h" diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 7b284224a9..93d5d02b02 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -8,6 +8,7 @@ #include "core/fxge/include/cfx_fontmapper.h" #include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_font.h" #include "core/fxge/include/fx_ge.h" #include "fpdfsdk/include/fsdk_define.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 1d2f6de755..5a1a0ce1d7 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -22,6 +22,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxcrt/include/fx_safe_types.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" diff --git a/pdfium.gyp b/pdfium.gyp index 26f46edba9..50409daf8f 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -720,7 +720,7 @@ "core/fxge/ge/include/cfx_fontmapper.h", "core/fxge/ge/include/cfx_fontmgr.h", "core/fxge/ge/include/ifx_systemfontinfo.h", - 'core/fxge/ge/fx_ge.cpp', + 'core/fxge/ge/cfx_gemodule.cpp', 'core/fxge/ge/fx_ge_device.cpp', 'core/fxge/ge/fx_ge_font.cpp', 'core/fxge/ge/fx_ge_fontmap.cpp', @@ -729,6 +729,7 @@ 'core/fxge/ge/fx_ge_text.cpp', 'core/fxge/ge/fx_text_int.h', 'core/fxge/ifx_renderdevicedriver.cpp', + 'core/fxge/include/cfx_gemodule.h', "core/fxge/include/cfx_windowsdevice.h", 'core/fxge/include/fx_dib.h', 'core/fxge/include/fx_font.h', diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 3612966e75..6161bbc9e8 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -8,6 +8,7 @@ #include <algorithm> +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 1407e95c79..3e8f28deb0 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -9,6 +9,7 @@ #include "core/fxcrt/include/fx_stream.h" #include "core/fxge/include/cfx_fontmapper.h" #include "core/fxge/include/cfx_fontmgr.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/ifx_systemfontinfo.h" #include "core/fxge/include/fx_ge.h" #include "xfa/fgas/crt/fgas_codepage.h" diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp index 109fb8f992..4cdb7e7f5f 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp @@ -25,6 +25,7 @@ #include <algorithm> #include <memory> +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp index a7393a48f6..94cec3e494 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp index bea145b8d1..75693ff46e 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 2b06c8519b..158af2cdd7 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index e4b25dec85..4fac623bdd 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -12,6 +12,7 @@ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" #include "core/fxcodec/codec/include/ccodec_progressivedecoder.h" #include "core/fxcodec/include/fx_codec.h" +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/include/fxfa_widget.h" #include "xfa/fxfa/include/cxfa_eventparam.h" diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 24f240ddd0..2d2bddd44a 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -8,6 +8,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_xml.h" +#include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/fx_ge.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_locale.h" diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index c3f5b7b096..90225d4e19 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -8,6 +8,7 @@ #include <memory> +#include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxgraphics/cagg_graphics.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" |