From 9ada2d83cbb629f286936ebc7a208a61164f873b Mon Sep 17 00:00:00 2001 From: npm Date: Wed, 10 Aug 2016 07:51:38 -0700 Subject: Move CFX_RenderDevice, CFX_FxgeDevice, and CFX_GraphStateData into their own files. This is the third CL to separate fx_ge into classes, one per file. All fx_ge.h includes had to be replaced with new includes The method definitions for CFX_FxgeDevice were not moved to a single file. These methods are defined in two folders different from fxge/ge, so they were left untouched for now. Review-Url: https://codereview.chromium.org/2223213002 --- xfa/fde/cfde_path.h | 2 +- xfa/fde/fde_gedevice.cpp | 2 ++ xfa/fde/fde_gedevice.h | 3 ++- xfa/fde/fde_visualset.h | 2 ++ xfa/fde/tto/fde_textout.h | 4 +++- xfa/fgas/font/fgas_stdfontmgr.cpp | 1 - xfa/fgas/layout/fgas_textbreak.h | 2 +- xfa/fxbarcode/BC_TwoDimWriter.cpp | 3 ++- xfa/fxbarcode/oned/BC_OneDimWriter.cpp | 3 +++ xfa/fxbarcode/oned/BC_OneDimWriter.h | 2 +- xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp | 1 + xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp | 1 + xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp | 1 + xfa/fxfa/app/xfa_ffwidget.cpp | 1 + xfa/fxfa/include/xfa_ffwidget.h | 2 +- xfa/fxfa/parser/xfa_localemgr.cpp | 1 - xfa/fxgraphics/cfx_graphics.cpp | 2 ++ xfa/fxgraphics/cfx_path_generator.cpp | 1 + xfa/fxgraphics/cfx_path_generator.h | 1 - xfa/fxgraphics/include/cfx_graphics.h | 5 ++++- 20 files changed, 29 insertions(+), 11 deletions(-) (limited to 'xfa') diff --git a/xfa/fde/cfde_path.h b/xfa/fde/cfde_path.h index fcf35cd5dd..54bebf3bc8 100644 --- a/xfa/fde/cfde_path.h +++ b/xfa/fde/cfde_path.h @@ -8,7 +8,7 @@ #define XFA_FDE_CFDE_PATH_H_ #include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Path : public CFX_Target { diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 6161bbc9e8..2579365245 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -9,6 +9,8 @@ #include #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_graphstatedata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h index bb06cf6b53..e3b9208d93 100644 --- a/xfa/fde/fde_gedevice.h +++ b/xfa/fde/fde_gedevice.h @@ -7,13 +7,14 @@ #ifndef XFA_FDE_FDE_GEDEVICE_H_ #define XFA_FDE_FDE_GEDEVICE_H_ -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Brush; class CFDE_Path; class CFDE_Pen; class CFGAS_GEFont; +class CFX_GraphStateData; class CFDE_RenderDevice : public CFX_Target { public: diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 2005f73f84..4ad24d7630 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h @@ -15,6 +15,8 @@ #include "xfa/fgas/crt/fgas_memory.h" #include "xfa/fgas/font/fgas_font.h" +struct FXTEXT_CHARPOS; + enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Canvas = 0x00, FDE_VISUALOBJ_Text = 0x01 diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 8d2c0fe8a0..6ce32d2fe8 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -10,8 +10,9 @@ #include #include +#include "core/fxge/include/cfx_fxgedevice.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_dib.h" -#include "core/fxge/include/fx_ge.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h" @@ -42,6 +43,7 @@ #define FDE_TTOALIGNMENT_BottomAuto 11 class CFDE_RenderDevice; +class CFX_RenderDevice; class CFX_TxtBreak; struct FX_TXTRUN; diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 3e8f28deb0..20a520414c 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -11,7 +11,6 @@ #include "core/fxge/include/cfx_fontmgr.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/ifx_systemfontinfo.h" -#include "core/fxge/include/fx_ge.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" #include "xfa/fgas/font/fgas_gefont.h" diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 366ba80cd0..b5f8ca1edc 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -10,7 +10,7 @@ #include #include "core/fxcrt/include/fx_ucd.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_unicode.h" diff --git a/xfa/fxbarcode/BC_TwoDimWriter.cpp b/xfa/fxbarcode/BC_TwoDimWriter.cpp index e4cc6e890a..cda0467fe1 100644 --- a/xfa/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/fxbarcode/BC_TwoDimWriter.cpp @@ -6,8 +6,9 @@ #include +#include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "third_party/base/numerics/safe_math.h" #include "xfa/fxbarcode/BC_TwoDimWriter.h" #include "xfa/fxbarcode/BC_Writer.h" diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp index 9ab1aeb53e..6a914a91dc 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp @@ -25,8 +25,11 @@ #include #include +#include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index 1480b82df1..91763a90a8 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h @@ -9,7 +9,7 @@ #include -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/include/BC_Library.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp index f4b0a6fdcb..e2bbfd5726 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp index 577654bd73..0a7f3a8a50 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 8fd85fc6a1..01660b75c7 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -20,6 +20,7 @@ * limitations under the License. */ +#include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index f4b6a8aeb9..ed42aa4825 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -14,6 +14,7 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/include/fxfa_widget.h" #include "xfa/fxfa/include/cxfa_eventparam.h" diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index bde247fab4..ca325ee33d 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -10,7 +10,7 @@ #include #include "core/fxcodec/include/fx_codec_def.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_graphstatedata.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 2d2bddd44a..2d100746c9 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -9,7 +9,6 @@ #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_xml.h" #include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/fx_ge.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_locale.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index 0e18d65e2d..083ef7bff4 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -8,7 +8,9 @@ #include +#include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fxgraphics/cagg_graphics.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxgraphics/cfx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp index aadaa85ad0..2af39c49d7 100644 --- a/xfa/fxgraphics/cfx_path_generator.cpp +++ b/xfa/fxgraphics/cfx_path_generator.cpp @@ -7,6 +7,7 @@ #include "xfa/fxgraphics/cfx_path_generator.h" #include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/include/cfx_renderdevice.h" CFX_PathGenerator::CFX_PathGenerator() : m_pPathData(new CFX_PathData) {} diff --git a/xfa/fxgraphics/cfx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h index 0fed30f93f..aa17a7e323 100644 --- a/xfa/fxgraphics/cfx_path_generator.h +++ b/xfa/fxgraphics/cfx_path_generator.h @@ -10,7 +10,6 @@ #include #include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/fx_ge.h" class CFX_PathGenerator { public: diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h index e581089aec..129ae6e18b 100644 --- a/xfa/fxgraphics/include/cfx_graphics.h +++ b/xfa/fxgraphics/include/cfx_graphics.h @@ -10,8 +10,11 @@ #include #include "core/fxcrt/include/fx_system.h" +#include "core/fxge/include/cfx_fxgedevice.h" +#include "core/fxge/include/cfx_graphstatedata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_dib.h" -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/fx_font.h" #include "xfa/fwl/core/fwl_error.h" class CFX_Color; -- cgit v1.2.3