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 --- core/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 1 + core/fpdfapi/fpdf_page/include/cpdf_path.h | 1 + core/fpdfapi/fpdf_page/pageint.h | 1 + core/fpdfapi/fpdf_render/fpdf_render.cpp | 1 + core/fpdfapi/fpdf_render/fpdf_render_image.cpp | 1 + core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 1 + core/fpdfapi/fpdf_render/fpdf_render_text.cpp | 1 + core/fpdfapi/fpdf_render/render_int.h | 1 + 8 files changed, 8 insertions(+) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp index e20fe44db8..483a6b1fd6 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -34,6 +34,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fxcrt/include/fx_safe_types.h" +#include "core/fxge/include/cfx_pathdata.h" namespace { diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h index d9f3ead88c..bed40581fa 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_ #include "core/fxcrt/include/fx_system.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" class CPDF_Path : public CFX_CountRef { diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h index 30c58745c6..655e02d9b2 100644 --- a/core/fpdfapi/fpdf_page/pageint.h +++ b/core/fpdfapi/fpdf_page/pageint.h @@ -16,6 +16,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" #include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" class CPDF_AllStates; diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index f4e1414172..86bc3aad77 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -30,6 +30,7 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index f4f82a131e..ce58dd9f8d 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -26,6 +26,7 @@ #include "core/fpdfdoc/include/cpdf_occontext.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" #ifdef _SKIA_SUPPORT_ diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index dcf4407771..d9a93dc774 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -21,6 +21,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/ifx_renderdevicedriver.h" namespace { diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index f1c204db0c..a64bc89bc0 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -23,6 +23,7 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/fx_ge.h" namespace { diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h index e3e1a8ad42..f487b46c18 100644 --- a/core/fpdfapi/fpdf_render/render_int.h +++ b/core/fpdfapi/fpdf_render/render_int.h @@ -22,6 +22,7 @@ class CCodec_ScanlineDecoder; class CFX_FontCache; class CFX_GlyphBitmap; class CFX_ImageTransformer; +class CFX_PathData; class CPDF_Color; class CPDF_Dictionary; class CPDF_Document; -- cgit v1.2.3