Clean up xfa/fde/cfde_textout.h.

- Move enums/structs other than CFDE_TextOut to a separate header.
- Move CFDE_TTOLine into CFDE_TextOut.

Change-Id: I63196ebe6c02bc88d1c20ecb625505013edbfa26
Reviewed-on: https://pdfium-review.googlesource.com/22930
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h
index 980eeb207d..58f77edf31 100644
--- a/xfa/fde/cfde_texteditengine.h
+++ b/xfa/fde/cfde_texteditengine.h
@@ -15,9 +15,10 @@
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fgas/layout/cfx_txtbreak.h"
 
+class CFGAS_GEFont;
+
 struct FDE_TEXTEDITPIECE {
   FDE_TEXTEDITPIECE();
   FDE_TEXTEDITPIECE(const FDE_TEXTEDITPIECE& that);
@@ -97,14 +98,12 @@ class CFDE_TextEditEngine {
   void SetAvailableWidth(size_t width);
 
   void SetFont(RetainPtr<CFGAS_GEFont> font);
-  RetainPtr<CFGAS_GEFont> GetFont() const { return font_; }
+  RetainPtr<CFGAS_GEFont> GetFont() const;
   void SetFontSize(float size);
   float GetFontSize() const { return font_size_; }
   void SetFontColor(FX_ARGB color) { font_color_ = color; }
   FX_ARGB GetFontColor() const { return font_color_; }
-  float GetFontAscent() const {
-    return (static_cast<float>(font_->GetAscent()) * font_size_) / 1000;
-  }
+  float GetFontAscent() const;
 
   void SetAlignment(uint32_t alignment);
   float GetLineSpace() const { return line_spacing_; }