diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-31 13:19:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-31 17:29:26 +0000 |
| commit | bcd1e70175b6bbbcb9d9466c579e0538f34297c6 (patch) | |
| tree | 9748923cde5a3e52054488fbad5f9dbb855aecc0 /core/fxge | |
| parent | bc0ca1ec9b157ab8773c9043725c7422f7c1a57c (diff) | |
| download | pdfium-bcd1e70175b6bbbcb9d9466c579e0538f34297c6.tar.xz | |
Remove fx_basic.h
This CL removes the fx_basic.h header and fixes up includes as needed.
Change-Id: I49af32a8327bdbcda40c50a61ffbd75d06609040
Reviewed-on: https://pdfium-review.googlesource.com/12670
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/cfx_cliprgn.h | 1 | ||||
| -rw-r--r-- | core/fxge/cfx_folderfontinfo.cpp | 1 | ||||
| -rw-r--r-- | core/fxge/cfx_font.cpp | 1 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_dibitmap.h | 1 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_dibsource.h | 2 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_imagestretcher.h | 2 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_imagetransformer.h | 1 | ||||
| -rw-r--r-- | core/fxge/dib/cstretchengine.h | 1 | ||||
| -rw-r--r-- | core/fxge/fx_font.h | 1 | ||||
| -rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 1 |
10 files changed, 10 insertions, 2 deletions
diff --git a/core/fxge/cfx_cliprgn.h b/core/fxge/cfx_cliprgn.h index 866af9b205..0dfc4991fd 100644 --- a/core/fxge/cfx_cliprgn.h +++ b/core/fxge/cfx_cliprgn.h @@ -7,6 +7,7 @@ #ifndef CORE_FXGE_CFX_CLIPRGN_H_ #define CORE_FXGE_CFX_CLIPRGN_H_ +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" class CFX_DIBitmap; diff --git a/core/fxge/cfx_folderfontinfo.cpp b/core/fxge/cfx_folderfontinfo.cpp index c82d55982a..f4f57e4b05 100644 --- a/core/fxge/cfx_folderfontinfo.cpp +++ b/core/fxge/cfx_folderfontinfo.cpp @@ -10,6 +10,7 @@ #include <utility> #include "core/fxcrt/fx_codepage.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_font.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp index 8b34819e05..7a51df1b85 100644 --- a/core/fxge/cfx_font.cpp +++ b/core/fxge/cfx_font.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/font/cpdf_font.h" #include "core/fxcrt/fx_codepage.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/cfx_facecache.h" #include "core/fxge/cfx_fontcache.h" #include "core/fxge/cfx_fontmgr.h" diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h index 2b5555befc..fb676691ef 100644 --- a/core/fxge/dib/cfx_dibitmap.h +++ b/core/fxge/dib/cfx_dibitmap.h @@ -9,7 +9,6 @@ #include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/dib/cfx_dibsource.h" #include "third_party/base/stl_util.h" diff --git a/core/fxge/dib/cfx_dibsource.h b/core/fxge/dib/cfx_dibsource.h index 8b6d960de6..2315318ccb 100644 --- a/core/fxge/dib/cfx_dibsource.h +++ b/core/fxge/dib/cfx_dibsource.h @@ -10,8 +10,8 @@ #include <memory> #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxge/fx_dib.h" enum FXDIB_Channel { diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h index f31669b866..84411015dd 100644 --- a/core/fxge/dib/cfx_imagestretcher.h +++ b/core/fxge/dib/cfx_imagestretcher.h @@ -10,7 +10,9 @@ #include <memory> #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxge/dib/ifx_scanlinecomposer.h" #include "core/fxge/fx_dib.h" diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h index 694c44c932..0524a0c713 100644 --- a/core/fxge/dib/cfx_imagetransformer.h +++ b/core/fxge/dib/cfx_imagetransformer.h @@ -10,6 +10,7 @@ #include <memory> #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/dib/cfx_bitmapstorer.h" #include "core/fxge/dib/cfx_dibitmap.h" diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h index dd207af30d..14c0975023 100644 --- a/core/fxge/dib/cstretchengine.h +++ b/core/fxge/dib/cstretchengine.h @@ -9,6 +9,7 @@ #include <vector> +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/fx_dib.h" diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 5ef1a7d65e..57fdb54821 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -25,6 +25,7 @@ class CFX_FaceCache; class CFX_GlyphBitmap; class CFX_PathData; class CFX_SizeGlyphCache; +class IFX_SeekableReadStream; #if defined _SKIA_SUPPORT_ || defined _SKIA_SUPPORT_PATHS_ class SkTypeface; diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 05a4c3a9ed..754a5104c8 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -16,6 +16,7 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fxcodec/fx_codec.h" +#include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_memory.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_graphstatedata.h" |