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_font/common.h | 2 ++ core/src/fpdfapi/fpdf_font/font_int.h | 4 ++-- core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 13 +++++++------ core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp | 8 ++++---- core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 13 +++++++------ core/src/fpdfapi/fpdf_font/ttgsubtable.cpp | 7 ++++--- core/src/fpdfapi/fpdf_font/ttgsubtable.h | 7 +++++-- 7 files changed, 31 insertions(+), 23 deletions(-) (limited to 'core/src/fpdfapi/fpdf_font') diff --git a/core/src/fpdfapi/fpdf_font/common.h b/core/src/fpdfapi/fpdf_font/common.h index 38fe396c00..2888bc455e 100644 --- a/core/src/fpdfapi/fpdf_font/common.h +++ b/core/src/fpdfapi/fpdf_font/common.h @@ -7,6 +7,8 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ #define CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ +#include "core/include/fxcrt/fx_system.h" + typedef signed char TT_int8_t; typedef unsigned char TT_uint8_t; typedef signed short TT_int16_t; diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index c7a00dccc9..5418ffd2c9 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -9,8 +9,8 @@ #include -#include "../../../include/fxcrt/fx_basic.h" -#include "../../../include/fpdfapi/fpdf_resource.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" class CPDF_CID2UnicodeMap; class CPDF_CMap; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 07f9dda653..fb0f628147 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -4,14 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../fpdf_page/pageint.h" #include "font_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" + FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) { if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) == diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp index 92d1719efe..f6d1e2ab92 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" static const struct _UnicodeAlt { FX_WORD m_Unicode; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 43125d717a..bf67aab3e0 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -4,14 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_cmaps/cmap_int.h" #include "font_int.h" +#include "../fpdf_cmaps/cmap_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" + namespace { const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] = diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp index 1ee25995c2..0087bfad56 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" -#include "third_party/base/nonstd_unique_ptr.h" #include "ttgsubtable.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" +#include "third_party/base/nonstd_unique_ptr.h" + CFX_GlyphMap::CFX_GlyphMap() {} CFX_GlyphMap::~CFX_GlyphMap() {} extern "C" { diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index 5cf0e2413f..dee7a08857 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -7,9 +7,12 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ #define CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxcrt/fx_basic.h" +#include + #include "common.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxge/fx_font.h" +#include "core/include/fxge/fx_freetype.h" class CFX_GlyphMap { public: -- cgit v1.2.3