diff options
author | Lei Zhang <thestig@chromium.org> | 2018-10-26 20:25:18 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-26 20:25:18 +0000 |
commit | 2cae3e26526a8aeef5744665589d1bfaf5efe6f3 (patch) | |
tree | c93e98db9f90d07158e2e2d2311e6b70d5f98cb6 /core/fxge/dib | |
parent | 7df950ac2ef484880fe3cbfb9961bed34fee191d (diff) | |
download | pdfium-2cae3e26526a8aeef5744665589d1bfaf5efe6f3.tar.xz |
Forward declare a bunch of classes.
Then do IWYU to fix up build errors. Move some implementations out of
headers to allow more forward declarations.
Change-Id: Idbeb978705a21cd6fb710ca9f5e99b4ea7d93ec5
Reviewed-on: https://pdfium-review.googlesource.com/c/44632
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/dib')
-rw-r--r-- | core/fxge/dib/cfx_bitmapstorer.cpp | 1 | ||||
-rw-r--r-- | core/fxge/dib/cfx_bitmapstorer.h | 3 | ||||
-rw-r--r-- | core/fxge/dib/cfx_dibextractor.cpp | 1 | ||||
-rw-r--r-- | core/fxge/dib/cfx_dibextractor.h | 2 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagerenderer.cpp | 1 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagerenderer.h | 6 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagestretcher.cpp | 4 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagestretcher.h | 3 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagetransformer.cpp | 1 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagetransformer.h | 5 | ||||
-rw-r--r-- | core/fxge/dib/cfx_scanlinecompositor.h | 1 | ||||
-rw-r--r-- | core/fxge/dib/cstretchengine.h | 1 |
12 files changed, 20 insertions, 9 deletions
diff --git a/core/fxge/dib/cfx_bitmapstorer.cpp b/core/fxge/dib/cfx_bitmapstorer.cpp index 2d85a2ed7b..97ddf6f0b3 100644 --- a/core/fxge/dib/cfx_bitmapstorer.cpp +++ b/core/fxge/dib/cfx_bitmapstorer.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "core/fxge/dib/cfx_dibitmap.h" CFX_BitmapStorer::CFX_BitmapStorer() {} diff --git a/core/fxge/dib/cfx_bitmapstorer.h b/core/fxge/dib/cfx_bitmapstorer.h index 86f7f8719f..c8158a3d9a 100644 --- a/core/fxge/dib/cfx_bitmapstorer.h +++ b/core/fxge/dib/cfx_bitmapstorer.h @@ -9,9 +9,10 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" -#include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/scanlinecomposer_iface.h" +class CFX_DIBitmap; + class CFX_BitmapStorer final : public ScanlineComposerIface { public: CFX_BitmapStorer(); diff --git a/core/fxge/dib/cfx_dibextractor.cpp b/core/fxge/dib/cfx_dibextractor.cpp index 8211dc725a..f6f31e8f73 100644 --- a/core/fxge/dib/cfx_dibextractor.cpp +++ b/core/fxge/dib/cfx_dibextractor.cpp @@ -7,6 +7,7 @@ #include "core/fxge/dib/cfx_dibextractor.h" #include "core/fxge/dib/cfx_dibbase.h" +#include "core/fxge/dib/cfx_dibitmap.h" CFX_DIBExtractor::CFX_DIBExtractor(const RetainPtr<CFX_DIBBase>& pSrc) { if (!pSrc->GetBuffer()) { diff --git a/core/fxge/dib/cfx_dibextractor.h b/core/fxge/dib/cfx_dibextractor.h index cd97f20aac..eff96b1217 100644 --- a/core/fxge/dib/cfx_dibextractor.h +++ b/core/fxge/dib/cfx_dibextractor.h @@ -8,9 +8,9 @@ #define CORE_FXGE_DIB_CFX_DIBEXTRACTOR_H_ #include "core/fxcrt/retain_ptr.h" -#include "core/fxge/dib/cfx_dibitmap.h" class CFX_DIBBase; +class CFX_DIBitmap; class CFX_DIBExtractor { public: diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp index 9641bc0ad0..6eadb05997 100644 --- a/core/fxge/dib/cfx_imagerenderer.cpp +++ b/core/fxge/dib/cfx_imagerenderer.cpp @@ -9,6 +9,7 @@ #include <memory> #include "core/fxge/cfx_cliprgn.h" +#include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_imagestretcher.h" #include "core/fxge/dib/cfx_imagetransformer.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h index 2a16d2d18b..01eec3a947 100644 --- a/core/fxge/dib/cfx_imagerenderer.h +++ b/core/fxge/dib/cfx_imagerenderer.h @@ -13,12 +13,12 @@ #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_bitmapcomposer.h" -#include "core/fxge/dib/cfx_dibbase.h" -#include "core/fxge/dib/cfx_dibitmap.h" -#include "core/fxge/fx_dib.h" +class CFX_DIBBase; +class CFX_DIBitmap; class CFX_ImageTransformer; class CFX_ImageStretcher; +class PauseIndicatorIface; class CFX_ImageRenderer { public: diff --git a/core/fxge/dib/cfx_imagestretcher.cpp b/core/fxge/dib/cfx_imagestretcher.cpp index 53c47c996e..763c1db5d2 100644 --- a/core/fxge/dib/cfx_imagestretcher.cpp +++ b/core/fxge/dib/cfx_imagestretcher.cpp @@ -131,6 +131,10 @@ bool CFX_ImageStretcher::Continue(PauseIndicatorIface* pPause) { return ContinueStretch(pPause); } +RetainPtr<CFX_DIBBase> CFX_ImageStretcher::source() { + return m_pSource; +} + bool CFX_ImageStretcher::StartStretch() { m_pStretchEngine = pdfium::MakeUnique<CStretchEngine>( m_pDest.Get(), m_DestFormat, m_DestWidth, m_DestHeight, m_ClipRect, diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h index 8e866620fd..9f4e44b0d0 100644 --- a/core/fxge/dib/cfx_imagestretcher.h +++ b/core/fxge/dib/cfx_imagestretcher.h @@ -17,6 +17,7 @@ #include "core/fxge/fx_dib.h" class CFX_DIBBase; +class CStretchEngine; class PauseIndicatorIface; class CFX_ImageStretcher { @@ -32,7 +33,7 @@ class CFX_ImageStretcher { bool Start(); bool Continue(PauseIndicatorIface* pPause); - RetainPtr<CFX_DIBBase> source() { return m_pSource; } + RetainPtr<CFX_DIBBase> source(); private: bool StartQuickStretch(); diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp index 96249750ee..29d22f4f77 100644 --- a/core/fxge/dib/cfx_imagetransformer.cpp +++ b/core/fxge/dib/cfx_imagetransformer.cpp @@ -10,6 +10,7 @@ #include <memory> #include <utility> +#include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_imagestretcher.h" #include "core/fxge/fx_dib.h" #include "third_party/base/compiler_specific.h" diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h index ecd91872c0..052df941d4 100644 --- a/core/fxge/dib/cfx_imagetransformer.h +++ b/core/fxge/dib/cfx_imagetransformer.h @@ -13,10 +13,11 @@ #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_bitmapstorer.h" -#include "core/fxge/dib/cfx_dibbase.h" -#include "core/fxge/dib/cfx_dibitmap.h" +class CFX_DIBBase; +class CFX_DIBitmap; class CFX_ImageStretcher; +class PauseIndicatorIface; class CFX_ImageTransformer { public: diff --git a/core/fxge/dib/cfx_scanlinecompositor.h b/core/fxge/dib/cfx_scanlinecompositor.h index fc86299032..b9625d9b12 100644 --- a/core/fxge/dib/cfx_scanlinecompositor.h +++ b/core/fxge/dib/cfx_scanlinecompositor.h @@ -9,7 +9,6 @@ #include <memory> -#include "core/fxge/dib/cfx_dibbase.h" #include "core/fxge/fx_dib.h" class CFX_ScanlineCompositor { diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h index db7a2be56d..6bb07c662c 100644 --- a/core/fxge/dib/cstretchengine.h +++ b/core/fxge/dib/cstretchengine.h @@ -14,6 +14,7 @@ #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" +class CFX_DIBBase; class PauseIndicatorIface; class ScanlineComposerIface; |