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/fpdfdoc/doc_action.cpp | 3 ++- core/src/fpdfdoc/doc_annot.cpp | 4 ++-- core/src/fpdfdoc/doc_ap.cpp | 6 +++--- core/src/fpdfdoc/doc_basic.cpp | 3 ++- core/src/fpdfdoc/doc_bookmark.cpp | 2 +- core/src/fpdfdoc/doc_form.cpp | 2 +- core/src/fpdfdoc/doc_formcontrol.cpp | 3 ++- core/src/fpdfdoc/doc_formfield.cpp | 2 +- core/src/fpdfdoc/doc_link.cpp | 2 +- core/src/fpdfdoc/doc_metadata.cpp | 4 ++-- core/src/fpdfdoc/doc_ocg.cpp | 3 ++- core/src/fpdfdoc/doc_tagged.cpp | 7 ++++--- core/src/fpdfdoc/doc_utils.cpp | 2 +- core/src/fpdfdoc/doc_viewerPreferences.cpp | 3 ++- core/src/fpdfdoc/doc_vt.cpp | 5 +++-- core/src/fpdfdoc/doc_vtmodule.cpp | 5 +++-- core/src/fpdfdoc/tagged_int.h | 2 +- 17 files changed, 33 insertions(+), 25 deletions(-) (limited to 'core/src/fpdfdoc') diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/src/fpdfdoc/doc_action.cpp index 3d439ff570..01fb064e47 100644 --- a/core/src/fpdfdoc/doc_action.cpp +++ b/core/src/fpdfdoc/doc_action.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" + CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const { if (!m_pDict) { return CPDF_Dest(); diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index e69ea80a35..36494cc2ea 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfapi/fpdf_pageobj.h" -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfdoc/fpdf_doc.h" #include "third_party/base/nonstd_unique_ptr.h" CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp index 77a1f15306..d6c25f31e3 100644 --- a/core/src/fpdfdoc/doc_ap.cpp +++ b/core/src/fpdfdoc/doc_ap.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_ap.h" -#include "../../include/fpdfdoc/fpdf_doc.h" -#include "../../include/fpdfdoc/fpdf_vt.h" +#include "core/include/fpdfdoc/fpdf_ap.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_vt.h" #include "doc_utils.h" #include "pdf_vt.h" diff --git a/core/src/fpdfdoc/doc_basic.cpp b/core/src/fpdfdoc/doc_basic.cpp index 414f5749d0..4da182814d 100644 --- a/core/src/fpdfdoc/doc_basic.cpp +++ b/core/src/fpdfdoc/doc_basic.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" + const int nMaxRecursion = 32; int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) { CPDF_Array* pArray = ToArray(m_pObj); diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp index c5cbfd8d2e..84b5a8b730 100644 --- a/core/src/fpdfdoc/doc_bookmark.cpp +++ b/core/src/fpdfdoc/doc_bookmark.cpp @@ -6,7 +6,7 @@ #include -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" #include "third_party/base/nonstd_unique_ptr.h" CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild( diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index 8d8a836cab..776f19fdca 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" #include "doc_utils.h" const int nMaxRecursion = 32; diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp index 35329f9e05..0796b6b434 100644 --- a/core/src/fpdfdoc/doc_formcontrol.cpp +++ b/core/src/fpdfdoc/doc_formcontrol.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" + CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict) { m_pField = pField; diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp index efa2ea23bd..a4de7bbee3 100644 --- a/core/src/fpdfdoc/doc_formfield.cpp +++ b/core/src/fpdfdoc/doc_formfield.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" #include "doc_utils.h" FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) { diff --git a/core/src/fpdfdoc/doc_link.cpp b/core/src/fpdfdoc/doc_link.cpp index 6d3f6c5046..37e4fe358b 100644 --- a/core/src/fpdfdoc/doc_link.cpp +++ b/core/src/fpdfdoc/doc_link.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" CPDF_LinkList::CPDF_LinkList() { } diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp index 3d0f12f3de..c9550a8c16 100644 --- a/core/src/fpdfdoc/doc_metadata.cpp +++ b/core/src/fpdfdoc/doc_metadata.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" -#include "../../include/fxcrt/fx_xml.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fxcrt/fx_xml.h" CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) { CPDF_Dictionary* pRoot = pDoc->GetRoot(); diff --git a/core/src/fpdfdoc/doc_ocg.cpp b/core/src/fpdfdoc/doc_ocg.cpp index b252456df6..7f9c6774df 100644 --- a/core/src/fpdfdoc/doc_ocg.cpp +++ b/core/src/fpdfdoc/doc_ocg.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" + static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object* pObject, const CPDF_Dictionary* pGroupDict) { if (!pObject || !pGroupDict) diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp index f1877c6573..2a3cfb9707 100644 --- a/core/src/fpdfdoc/doc_tagged.cpp +++ b/core/src/fpdfdoc/doc_tagged.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfapi/fpdf_parser.h" -#include "../../include/fpdfapi/fpdf_page.h" -#include "../../include/fpdfdoc/fpdf_tagged.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfdoc/fpdf_tagged.h" #include "tagged_int.h" + const int nMaxRecursion = 32; static FX_BOOL IsTagged(const CPDF_Document* pDoc) { CPDF_Dictionary* pCatalog = pDoc->GetRoot(); diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/src/fpdfdoc/doc_utils.cpp index 7d3fdf2f23..b0eafbff20 100644 --- a/core/src/fpdfdoc/doc_utils.cpp +++ b/core/src/fpdfdoc/doc_utils.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" #include "doc_utils.h" static const int FPDFDOC_UTILS_MAXRECURSION = 32; diff --git a/core/src/fpdfdoc/doc_viewerPreferences.cpp b/core/src/fpdfdoc/doc_viewerPreferences.cpp index 50962b7d47..a6975cc958 100644 --- a/core/src/fpdfdoc/doc_viewerPreferences.cpp +++ b/core/src/fpdfdoc/doc_viewerPreferences.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" + CPDF_ViewerPreferences::CPDF_ViewerPreferences(CPDF_Document* pDoc) : m_pDoc(pDoc) {} CPDF_ViewerPreferences::~CPDF_ViewerPreferences() {} diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp index fe5680ff9b..07824e8f04 100644 --- a/core/src/fpdfdoc/doc_vt.cpp +++ b/core/src/fpdfdoc/doc_vt.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" -#include "../../include/fpdfdoc/fpdf_vt.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_vt.h" #include "pdf_vt.h" + const uint8_t gFontSizeSteps[] = {4, 6, 8, 9, 10, 12, 14, 18, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, 80, 90, 100, 110, 120, 130, 144}; diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/src/fpdfdoc/doc_vtmodule.cpp index 834d459de3..c67b9605c7 100644 --- a/core/src/fpdfdoc/doc_vtmodule.cpp +++ b/core/src/fpdfdoc/doc_vtmodule.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fpdfdoc/fpdf_doc.h" -#include "../../include/fpdfdoc/fpdf_vt.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_vt.h" #include "pdf_vt.h" + IPDF_VariableText* IPDF_VariableText::NewVariableText() { return new CPDF_VariableText(); } diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h index de6854ea0b..b7f18bd177 100644 --- a/core/src/fpdfdoc/tagged_int.h +++ b/core/src/fpdfdoc/tagged_int.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFDOC_TAGGED_INT_H_ #define CORE_SRC_FPDFDOC_TAGGED_INT_H_ -#include "../../include/fpdfdoc/fpdf_tagged.h" +#include "core/include/fpdfdoc/fpdf_tagged.h" class CPDF_StructElementImpl; -- cgit v1.2.3