From 6e59fb5fda71eb527568a58d9c948b5f76c9bdc2 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 18 Jan 2018 19:03:58 +0000 Subject: Remove more unneeded includes and code from headers. Change-Id: I0a07dbc9850bef2184ed35ff04b08385fc1bdd17 Reviewed-on: https://pdfium-review.googlesource.com/22891 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- core/fxge/android/cfx_androidfontinfo.h | 1 - core/fxge/apple/fx_quartz_device.cpp | 1 + core/fxge/cfx_folderfontinfo.h | 1 - core/fxge/cfx_gemodule.h | 2 -- core/fxge/cfx_renderdevice.h | 3 ++- core/fxge/cfx_unicodeencoding.h | 2 +- core/fxge/cfx_unicodeencodingex.h | 1 - core/fxge/fx_ge_text.cpp | 1 + core/fxge/ifx_renderdevicedriver.cpp | 2 +- core/fxge/ifx_systemfontinfo.h | 1 - core/fxge/skia/fx_skia_device.cpp | 4 ++++ core/fxge/skia/fx_skia_device.h | 2 +- core/fxge/win32/cfx_windowsdib.h | 3 ++- 13 files changed, 13 insertions(+), 11 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h index bf5fae59df..e49b1617de 100644 --- a/core/fxge/android/cfx_androidfontinfo.h +++ b/core/fxge/android/cfx_androidfontinfo.h @@ -10,7 +10,6 @@ #include "core/fxcrt/fx_system.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_fontmapper.h" -#include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" class CFPF_SkiaFontMgr; diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 4ab6620485..709f201f8a 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -14,6 +14,7 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_freetype.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/cfx_folderfontinfo.h b/core/fxge/cfx_folderfontinfo.h index 79faa01838..397b386066 100644 --- a/core/fxge/cfx_folderfontinfo.h +++ b/core/fxge/cfx_folderfontinfo.h @@ -13,7 +13,6 @@ #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_fontmapper.h" -#include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" class CFX_FolderFontInfo : public IFX_SystemFontInfo { diff --git a/core/fxge/cfx_gemodule.h b/core/fxge/cfx_gemodule.h index 7849937f8f..f48d065561 100644 --- a/core/fxge/cfx_gemodule.h +++ b/core/fxge/cfx_gemodule.h @@ -9,8 +9,6 @@ #include -#include "core/fxge/fx_font.h" - class CFX_FontCache; class CFX_FontMgr; diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index 5b18b2293a..d8cb9a6952 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -12,11 +12,12 @@ #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" -#include "core/fxge/fx_font.h" +class CFX_DIBitmap; class CFX_Font; class CFX_GraphStateData; class CFX_ImageRenderer; +class IFX_PauseIndicator; class IFX_RenderDeviceDriver; #define FXDC_DEVICE_CLASS 1 diff --git a/core/fxge/cfx_unicodeencoding.h b/core/fxge/cfx_unicodeencoding.h index 40562e7c4a..f8bcff391f 100644 --- a/core/fxge/cfx_unicodeencoding.h +++ b/core/fxge/cfx_unicodeencoding.h @@ -7,7 +7,7 @@ #ifndef CORE_FXGE_CFX_UNICODEENCODING_H_ #define CORE_FXGE_CFX_UNICODEENCODING_H_ -#include "core/fxge/fx_font.h" +#include #ifdef PDF_ENABLE_XFA #define FXFM_ENC_TAG(a, b, c, d) \ diff --git a/core/fxge/cfx_unicodeencodingex.h b/core/fxge/cfx_unicodeencodingex.h index e62410a122..5632d9665d 100644 --- a/core/fxge/cfx_unicodeencodingex.h +++ b/core/fxge/cfx_unicodeencodingex.h @@ -14,7 +14,6 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_unicodeencoding.h" #include "core/fxge/fx_dib.h" -#include "core/fxge/fx_freetype.h" class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding { public: diff --git a/core/fxge/fx_ge_text.cpp b/core/fxge/fx_ge_text.cpp index a04e6d0e85..147e712e57 100644 --- a/core/fxge/fx_ge_text.cpp +++ b/core/fxge/fx_ge_text.cpp @@ -10,6 +10,7 @@ #include "core/fxcrt/fx_safe_types.h" #include "core/fxge/cfx_pathdata.h" +#include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" #include "core/fxge/ifx_renderdevicedriver.h" diff --git a/core/fxge/ifx_renderdevicedriver.cpp b/core/fxge/ifx_renderdevicedriver.cpp index 669aadf0d8..eae773d75c 100644 --- a/core/fxge/ifx_renderdevicedriver.cpp +++ b/core/fxge/ifx_renderdevicedriver.cpp @@ -8,7 +8,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/cfx_pathdata.h" -#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/dib/cfx_dibitmap.h" IFX_RenderDeviceDriver::~IFX_RenderDeviceDriver() {} diff --git a/core/fxge/ifx_systemfontinfo.h b/core/fxge/ifx_systemfontinfo.h index 391baa2cdd..1ae097b9f9 100644 --- a/core/fxge/ifx_systemfontinfo.h +++ b/core/fxge/ifx_systemfontinfo.h @@ -10,7 +10,6 @@ #include #include "core/fxge/cfx_fontmapper.h" -#include "core/fxge/fx_font.h" const uint32_t kTableNAME = FXDWORD_GET_MSBFIRST("name"); const uint32_t kTableTTCF = FXDWORD_GET_MSBFIRST("ttcf"); diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 6e27ea1775..ab8efff72c 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -1548,6 +1548,10 @@ void CFX_SkiaDeviceDriver::Flush() { m_pCache->Flush(); } +void CFX_SkiaDeviceDriver::PreMultiply() { + m_pBitmap->PreMultiply(); +} + bool CFX_SkiaDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 4423081251..7dfdef4de8 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -150,7 +150,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { void Clear(uint32_t color); void Flush() override; SkPictureRecorder* GetRecorder() const { return m_pRecorder; } - void PreMultiply() { m_pBitmap->PreMultiply(); } + void PreMultiply(); static void PreMultiply(const RetainPtr& pDIBitmap); SkCanvas* SkiaCanvas() { return m_pCanvas; } void DebugVerifyBitmapIsPreMultiplied() const; diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h index cc2305001e..7c2447ded2 100644 --- a/core/fxge/win32/cfx_windowsdib.h +++ b/core/fxge/win32/cfx_windowsdib.h @@ -11,7 +11,8 @@ #include #endif -#include "core/fxge/fx_dib.h" +#include "core/fxcrt/bytestring.h" +#include "core/fxge/dib/cfx_dibitmap.h" #define WINDIB_OPEN_MEMORY 0x1 #define WINDIB_OPEN_PATHNAME 0x2 -- cgit v1.2.3