From a9fa50f723654c4e8b26909bb686eaa3721df155 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:45:32 -0800 Subject: Merge to XFA: Fix relative includes within core/ TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . (cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8) Review URL: https://codereview.chromium.org/1438573002 . --- core/src/fpdfapi/fpdf_render/fpdf_render.cpp | 9 +++++---- core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp | 10 ++++++---- core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp | 15 ++++++++------- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 15 ++++++++------- core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 10 ++++++---- core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 9 +++++---- core/src/fpdfapi/fpdf_render/render_int.h | 4 +++- 7 files changed, 41 insertions(+), 31 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index 7b37b1b9bd..e5b4b66721 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {} diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp index 8da176e040..e82e45c710 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + struct CACHEINFO { FX_DWORD time; CPDF_Stream* pStream; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 0acaeba14c..b51520aa84 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -4,15 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcrt/fx_safe_types.h" +#include "core/include/fxge/fx_ge.h" + FX_BOOL CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj, const CFX_AffineMatrix* pObj2Device) { CPDF_ImageRenderer render; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index ea8ceee9d3..1cce90a243 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -4,16 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "render_int.h" + #include -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" -#include "render_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcrt/fx_safe_types.h" +#include "core/include/fxge/fx_ge.h" #include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 467ffc900c..4043230003 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + #define SHADING_STEPS 256 static void DrawAxialShading(CFX_DIBitmap* pBitmap, CFX_AffineMatrix* pObject2Bitmap, diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index c8d86e072d..4eac73fe62 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + CPDF_Type3Cache::~CPDF_Type3Cache() { for (const auto& pair : m_SizeMap) { delete pair.second; diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index a0eda2858e..ed44c26d41 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -9,10 +9,12 @@ #include -#include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" #include "third_party/base/nonstd_unique_ptr.h" class CFX_GlyphBitmap; +class CPDF_ImageCache; class CPDF_QuickStretcher; #define TYPE3_MAX_BLUES 16 -- cgit v1.2.3