From 660de3c494b68a574cb4cdf20359f51ddc260d3c Mon Sep 17 00:00:00 2001 From: npm Date: Mon, 8 Aug 2016 08:18:29 -0700 Subject: Move CFX_ClipRgn and CFX_PathData into their own files. This is the second CL in an attempt to split up the classes in fxge/include/fx_ge.h into their own files. CFX_ClipRgn is moved to core/fxge/ge because it is only used in core/fxge. The header for CFX_PathData is left in core/fxge/include since it is used elsewhere. Review-Url: https://codereview.chromium.org/2216853004 --- xfa/fde/cfde_path.h | 1 + xfa/fwl/theme/cfwl_checkboxtp.cpp | 1 + xfa/fxbarcode/BC_TwoDimWriter.cpp | 1 + xfa/fxbarcode/oned/BC_OneDimWriter.cpp | 1 + xfa/fxfa/app/xfa_ffwidget.cpp | 1 + xfa/fxgraphics/cfx_path.cpp | 1 + xfa/fxgraphics/cfx_path_generator.cpp | 2 ++ xfa/fxgraphics/cfx_path_generator.h | 1 + 8 files changed, 9 insertions(+) (limited to 'xfa') diff --git a/xfa/fde/cfde_path.h b/xfa/fde/cfde_path.h index c9f213d350..fcf35cd5dd 100644 --- a/xfa/fde/cfde_path.h +++ b/xfa/fde/cfde_path.h @@ -7,6 +7,7 @@ #ifndef XFA_FDE_CFDE_PATH_H_ #define XFA_FDE_CFDE_PATH_H_ +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" #include "xfa/fgas/crt/fgas_memory.h" diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 23cc21f360..d00a097c61 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -6,6 +6,7 @@ #include "xfa/fwl/theme/cfwl_checkboxtp.h" +#include "core/fxge/include/cfx_pathdata.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/basewidget/ifwl_checkbox.h" #include "xfa/fwl/core/cfwl_themebackground.h" diff --git a/xfa/fxbarcode/BC_TwoDimWriter.cpp b/xfa/fxbarcode/BC_TwoDimWriter.cpp index 40b5519750..91ea57097a 100644 --- a/xfa/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/fxbarcode/BC_TwoDimWriter.cpp @@ -6,6 +6,7 @@ #include +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" #include "third_party/base/numerics/safe_math.h" #include "xfa/fxbarcode/BC_TwoDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp index 4cdb7e7f5f..8ba7d8e755 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp @@ -26,6 +26,7 @@ #include #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_pathdata.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 4fac623bdd..6cea803fa5 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -13,6 +13,7 @@ #include "core/fxcodec/codec/include/ccodec_progressivedecoder.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_pathdata.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/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp index fe956d3fcc..892a339469 100644 --- a/xfa/fxgraphics/cfx_path.cpp +++ b/xfa/fxgraphics/cfx_path.cpp @@ -6,6 +6,7 @@ #include "xfa/fxgraphics/cfx_path.h" +#include "core/fxge/include/cfx_pathdata.h" #include "xfa/fxgraphics/cfx_path_generator.h" CFX_Path::CFX_Path() { diff --git a/xfa/fxgraphics/cfx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp index 984e2e9d1a..f2dc182b55 100644 --- a/xfa/fxgraphics/cfx_path_generator.cpp +++ b/xfa/fxgraphics/cfx_path_generator.cpp @@ -6,6 +6,8 @@ #include "xfa/fxgraphics/cfx_path_generator.h" +#include "core/fxge/include/cfx_pathdata.h" + CFX_PathGenerator::CFX_PathGenerator() : m_pPathData(nullptr) {} void CFX_PathGenerator::Create() { diff --git a/xfa/fxgraphics/cfx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h index 02aa4230d5..186178e516 100644 --- a/xfa/fxgraphics/cfx_path_generator.h +++ b/xfa/fxgraphics/cfx_path_generator.h @@ -7,6 +7,7 @@ #ifndef XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_ #define XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_ +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" class CFX_PathGenerator { -- cgit v1.2.3