From 3a479763796edeb8cf5acc8735a16878ad6bfeb9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 25 Feb 2016 15:16:44 -0500 Subject: Remove fde.h and IWYU. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1735353002 . --- BUILD.gn | 1 - xfa.gyp | 1 - xfa/src/fdp/include/fde.h | 24 ---------------------- xfa/src/fdp/include/fde_brs.h | 17 ++++++++++----- xfa/src/fdp/src/css/fde_csscache.cpp | 2 ++ xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 2 ++ xfa/src/fdp/src/css/fde_cssstylesheet.cpp | 3 +++ xfa/src/fee/src/fee/fde_txtedtengine.cpp | 5 +++++ xfa/src/foxitlib.h | 1 - xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp | 1 + xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 1 + xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 2 ++ xfa/src/fwl/src/basewidget/fwl_listboximp.cpp | 1 + .../fwl/src/basewidget/fwl_monthcalendarimp.cpp | 1 + xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp | 1 + xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp | 1 + xfa/src/fwl/src/core/fwl_formimp.cpp | 1 + xfa/src/fwl/src/core/fwl_widgetimp.cpp | 1 + xfa/src/fwl/src/lightwidget/widget.cpp | 1 + xfa/src/fwl/src/theme/checkboxtp.cpp | 1 + xfa/src/fwl/src/theme/formtp.cpp | 1 + xfa/src/fwl/src/theme/monthcalendartp.cpp | 1 + xfa/src/fwl/src/theme/widgettp.cpp | 1 + xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 4 +++- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 4 +++- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 1 + xfa/src/fxfa/src/app/xfa_textlayout.h | 21 +++++++++++++++++++ 27 files changed, 67 insertions(+), 34 deletions(-) delete mode 100644 xfa/src/fdp/include/fde.h diff --git a/BUILD.gn b/BUILD.gn index 08f00db9d1..5caf471a8f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -843,7 +843,6 @@ if (pdf_enable_xfa) { "xfa/include/fxfa/fxfa_widget.h", "xfa/include/fxgraphics/fx_graphics.h", "xfa/include/fxjse/fxjse.h", - "xfa/src/fdp/include/fde.h", "xfa/src/fdp/include/fde_brs.h", "xfa/src/fdp/include/fde_css.h", "xfa/src/fdp/include/fde_img.h", diff --git a/xfa.gyp b/xfa.gyp index 09019c1acb..ba84c97187 100644 --- a/xfa.gyp +++ b/xfa.gyp @@ -92,7 +92,6 @@ "xfa/include/fxfa/fxfa_widget.h", "xfa/include/fxgraphics/fx_graphics.h", "xfa/include/fxjse/fxjse.h", - "xfa/src/fdp/include/fde.h", "xfa/src/fdp/include/fde_brs.h", "xfa/src/fdp/include/fde_css.h", "xfa/src/fdp/include/fde_img.h", diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h deleted file mode 100644 index 9a6a663d10..0000000000 --- a/xfa/src/fdp/include/fde.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -// TODO(thestig): Remove this file and do IWYU. - -#ifndef XFA_SRC_FDP_INCLUDE_FDE_H_ -#define XFA_SRC_FDP_INCLUDE_FDE_H_ - -#include "xfa/src/fdp/include/fde_brs.h" -#include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fdp/include/fde_img.h" -#include "xfa/src/fdp/include/fde_mem.h" -#include "xfa/src/fdp/include/fde_pen.h" -#include "xfa/src/fdp/include/fde_psr.h" -#include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fdp/include/fde_rdr.h" -#include "xfa/src/fdp/include/fde_rdv.h" -#include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/fdp/include/fde_xml.h" - -#endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h index d3d9fc8610..daea23f7d9 100644 --- a/xfa/src/fdp/include/fde_brs.h +++ b/xfa/src/fdp/include/fde_brs.h @@ -7,13 +7,12 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_BRS_H_ #define XFA_SRC_FDP_INCLUDE_FDE_BRS_H_ +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_dib.h" + class IFDE_Image; class IFDE_Path; -class IFDE_Brush; -class IFDE_SolidBrush; -class IFDE_HatchBrush; -class IFDE_TextureBrush; -class IFDE_LinearGradientBrush; + #define FDE_BRUSHTYPE_Unknown -1 #define FDE_BRUSHTYPE_Solid 0 #define FDE_BRUSHTYPE_Hatch 1 @@ -25,11 +24,13 @@ class IFDE_LinearGradientBrush; #define FDE_WRAPMODE_TileFlipY 2 #define FDE_WRAPMODE_TileFlipXY 3 #define FDE_WRAPMODE_Clamp 4 + struct FDE_GRADIENTCOLOR { FX_FLOAT pos; FX_ARGB color; }; typedef CFX_ArrayTemplate CFDE_GradientColors; + class IFDE_Brush { public: static IFDE_Brush* Create(int32_t iType); @@ -37,6 +38,7 @@ class IFDE_Brush { virtual void Release() = 0; virtual int32_t GetType() const = 0; }; + class IFDE_SolidBrush : public IFDE_Brush { public: virtual FX_ARGB GetColor() const = 0; @@ -49,6 +51,7 @@ class IFDE_SolidBrush : public IFDE_Brush { virtual void ConcatMatrix(const CFX_Matrix& matrix) = 0; virtual void SetMatrix(const CFX_Matrix& matrix) = 0; }; + #define FDE_HATCHSTYLE_Horizontal 0 #define FDE_HATCHSTYLE_Vertical 1 #define FDE_HATCHSTYLE_ForwardDiagonal 2 @@ -106,6 +109,7 @@ class IFDE_SolidBrush : public IFDE_Brush { #define FDE_HATCHSTYLE_LargeGrid FDE_HATCHSTYLE_Cross #define FDE_HATCHSTYLE_Min FDE_HATCHSTYLE_Horizontal #define FDE_HATCHSTYLE_Max (FDE_HATCHSTYLE_Total - 1) + class IFDE_HatchBrush : public IFDE_Brush { public: virtual FX_ARGB GetColor(FX_BOOL bForegroundColor) const = 0; @@ -113,6 +117,7 @@ class IFDE_HatchBrush : public IFDE_Brush { virtual int32_t GetHatchStyle() const = 0; virtual FX_BOOL SetHatchStyle(int32_t iHatchStyle) = 0; }; + class IFDE_TextureBrush : public IFDE_Brush { public: virtual IFDE_Image* GetImage() const = 0; @@ -120,10 +125,12 @@ class IFDE_TextureBrush : public IFDE_Brush { virtual int32_t GetWrapMode() const = 0; virtual void SetWrapMode(int32_t iWrapMode) = 0; }; + #define FDE_LINEARGRADIENTMODE_Horizontal 0 #define FDE_LINEARGRADIENTMODE_Vertical 1 #define FDE_LINEARGRADIENTMODE_ForwardDiagonal 2 #define FDE_LINEARGRADIENTMODE_BackwardDiagonal 3 + class IFDE_LinearGradientBrush : public IFDE_Brush { public: virtual void GetLinearPoints(CFX_PointF& startingPoint, diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index 2aedb5f9da..bf6338bc39 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -6,8 +6,10 @@ #include +#include "xfa/src/fdp/include/fde_mem.h" #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/foxitlib.h" + FDE_CSSCACHEITEM::FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index a83ccfb575..19370000bf 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/include/fde_mem.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" #include "xfa/src/foxitlib.h" + IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { for (const FDE_CSSPROPERTYHOLDER* pHolder = m_pFirstProperty; pHolder; diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index b8046280f2..c2a3660ff1 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/include/fde_mem.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fdp/src/css/fde_cssstylesheet.h" #include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/foxitlib.h" + IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset," @@ -42,6 +44,7 @@ IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { return IFDE_CSSStyleSheet::LoadFromBuffer( CFX_WideString(), s_pStyle, FXSYS_wcslen(s_pStyle), FX_CODEPAGE_UTF8); } + IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadFromStream( const CFX_WideString& szUrl, IFX_Stream* pStream, diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index dd2a9f9a34..ed67442f07 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -12,15 +12,19 @@ #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" + #ifdef FDE_USEFORMATBLOCK #include "xfa/src/fee/src/fee/fde_txtedtblock.h" #endif + #define FDE_PAGEWIDTH_MAX 0xFFFF #define FDE_TXTPLATESIZE (1024 * 12) #define FDE_UNICODE_PARAGRAPH_SPERATOR (0x2029) #define FDE_TXTEDT_DORECORD_INS 0 #define FDE_TXTEDT_DORECORD_DEL 1 + #ifdef FDE_USEFORMATBLOCK #define FDE_TXTEDT_DORECORD_FORMATINS 3 #define FDE_TXTEDT_DORECORD_FORMATDEL 4 @@ -28,6 +32,7 @@ #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB #endif + IFDE_TxtEdtEngine* IFDE_TxtEdtEngine::Create() { return new CFDE_TxtEdtEngine(); } diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h index d45bdd6aea..58373732d6 100644 --- a/xfa/src/foxitlib.h +++ b/xfa/src/foxitlib.h @@ -10,7 +10,6 @@ #define XFA_SRC_FOXITLIB_H_ #include "xfa/include/foxitxfa.h" -#include "xfa/src/fdp/include/fde.h" #include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index cf6d6d6a43..8240279fc3 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -10,6 +10,7 @@ #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index cb414f540b..b963e1daf8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -7,6 +7,7 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 100a25dde6..79168af9c1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -11,6 +11,8 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_rdr.h" +#include "xfa/src/fdp/include/fde_rdv.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index f2885dc25e..e924b8b791 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -7,6 +7,7 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 2ce286b955..ada2d6fcc1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -10,6 +10,7 @@ #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index f743db995e..0a0cf816d6 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -7,6 +7,7 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index c2155dd3b1..c55d349f75 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -8,6 +8,7 @@ #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index 8622f2081c..031efd2a28 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -10,6 +10,7 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index a4678c2c70..187bdab8fa 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -18,6 +18,7 @@ #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 6c65798eaf..df8abdeede 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -8,6 +8,7 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_thread.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index 69a996bbe0..85dd01f85f 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -8,6 +8,7 @@ #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #define CHECKBOX_SIZE_SIGNMARGIN 3 diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index c8f032d80e..4d98762c13 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -8,6 +8,7 @@ #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_CXFormBorder 3 diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index f381421c8b..1de8e57fdb 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -8,6 +8,7 @@ #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200 diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index 89195a501c..af634e67c7 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -9,6 +9,7 @@ #include #include "xfa/include/fwl/core/fwl_widgetmgr.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 014743e108..45ef2b25c3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" + +#include "xfa/src/fdp/include/fde_rdr.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" @@ -11,7 +14,6 @@ #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" #include "xfa/src/fxfa/src/app/xfa_fftextedit.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index a51017bce1..e35b14f88f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -4,8 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" + #include +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" @@ -15,7 +18,6 @@ #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" #include "xfa/src/fxfa/src/app/xfa_fwladapter.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index fe4a2af9c9..2e95732da2 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -15,6 +15,7 @@ #include "xfa/include/fwl/basewidget/fwl_picturebox.h" #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" +#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index fa32b70961..03939ec7a3 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -7,8 +7,20 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_ +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fdp/include/fde_mem.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fgas/include/fx_rbk.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 + +class CXFA_Para; +class CXFA_Font; class CXFA_TextTabstopsContext; + class IXFA_TextProvider { public: virtual ~IXFA_TextProvider() {} @@ -22,6 +34,7 @@ class IXFA_TextProvider { const CFX_WideString& wsAttr, CFX_WideString& wsValue) = 0; }; + class CXFA_CSSTagProvider : public IFDE_CSSTagProvider { public: CXFA_CSSTagProvider() : m_bTagAviliable(FALSE), m_bContent(FALSE) {} @@ -43,6 +56,7 @@ class CXFA_CSSTagProvider : public IFDE_CSSTagProvider { CFX_WideString m_wsTagName; CFX_MapPtrToPtr m_Attributes; }; + class CXFA_TextParseContext : public CFX_Target { public: CXFA_TextParseContext() @@ -69,6 +83,7 @@ class CXFA_TextParseContext : public CFX_Target { FX_DWORD m_dwMatchedDecls : 28; FDE_CSSDISPLAY m_eDisplay : 4; }; + class CXFA_TextParser { public: CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {} @@ -128,6 +143,7 @@ class CXFA_TextParser { CFX_MapPtrTemplate m_mapXMLNodeToParseContext; }; + class CXFA_LoaderContext { public: CXFA_LoaderContext() @@ -157,6 +173,7 @@ class CXFA_LoaderContext { FX_DWORD m_dwFlags; CFX_FloatArray m_BlocksHeight; }; + class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { public: CXFA_LinkUserData(IFX_MEMAllocator* pAllocator, FX_WCHAR* pszText) @@ -181,6 +198,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { FX_DWORD m_dwRefCount; CFX_WideString m_pszURLContent; }; + class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { public: CXFA_TextUserData(IFX_MEMAllocator* pAllocator, IFDE_CSSComputedStyle* pStyle) @@ -257,10 +275,12 @@ class CXFA_PieceLine : public CFX_Target { CFX_Int32Array m_charCounts; }; typedef CFX_ArrayTemplate CXFA_PieceLineArray; + struct XFA_TABSTOPS { FX_DWORD dwAlign; FX_FLOAT fTabstops; }; + class CXFA_TextTabstopsContext { public: CXFA_TextTabstopsContext() @@ -301,6 +321,7 @@ class CXFA_TextTabstopsContext { FX_FLOAT m_fTabWidth; FX_FLOAT m_fLeft; }; + class CXFA_TextLayout { public: CXFA_TextLayout(IXFA_TextProvider* pTextProvider); -- cgit v1.2.3