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>

1 files changed, 9 insertions, 13 deletions

diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h
index 3a68c2251b..204655ab79 100644
--- a/core/fxge/fx_font.h
+++ b/core/fxge/fx_font.h
@@ -9,18 +9,11 @@
 
 #include <vector>
 
+#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/cfx_substfont.h"
-#include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/fx_dib.h"
 #include "core/fxge/fx_freetype.h"
 
-#if defined _SKIA_SUPPORT_ || defined _SKIA_SUPPORT_PATHS_
-class SkTypeface;
-
-using CFX_TypeFace = SkTypeface;
-#endif
-
 /* Font pitch and family flags */
 #define FXFONT_FF_FIXEDPITCH (1 << 0)
 #define FXFONT_FF_ROMAN (1 << 4)
@@ -51,6 +44,14 @@ using CFX_TypeFace = SkTypeface;
 #define GET_TT_LONG(w) \
   (uint32_t)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3])
 
+class CFX_DIBitmap;
+
+#if defined _SKIA_SUPPORT_ || defined _SKIA_SUPPORT_PATHS_
+class SkTypeface;
+
+using CFX_TypeFace = SkTypeface;
+#endif
+
 // Sets the given transform on the font, and resets it to the identity when it
 // goes out of scope.
 class ScopedFontTransform {
@@ -72,11 +73,6 @@ class CFX_GlyphBitmap {
   RetainPtr<CFX_DIBitmap> m_pBitmap;
 };
 
-inline CFX_GlyphBitmap::CFX_GlyphBitmap()
-    : m_pBitmap(pdfium::MakeRetain<CFX_DIBitmap>()) {}
-
-inline CFX_GlyphBitmap::~CFX_GlyphBitmap() = default;
-
 class FXTEXT_GLYPHPOS {
  public:
   FXTEXT_GLYPHPOS();