diff options
31 files changed, 38 insertions, 38 deletions
@@ -232,11 +232,11 @@ static_library("fpdfdoc") { "core/fpdfdoc/include/cpvt_wordplace.h", "core/fpdfdoc/include/cpvt_wordprops.h", "core/fpdfdoc/include/cpvt_wordrange.h", + "core/fpdfdoc/include/fpdf_doc.h", + "core/fpdfdoc/include/fpdf_tagged.h", "core/fpdfdoc/ipvt_fontmap.h", "core/fpdfdoc/pdf_vt.h", "core/fpdfdoc/tagged_int.h", - "core/include/fpdfdoc/fpdf_doc.h", - "core/include/fpdfdoc/fpdf_tagged.h", ] configs += [ ":pdfium_config" ] } diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp index f323d9a858..ee99becaee 100644 --- a/core/fpdfdoc/cpvt_generateap.cpp +++ b/core/fpdfdoc/cpvt_generateap.cpp @@ -14,8 +14,8 @@ #include "core/fpdfdoc/cpvt_color.h" #include "core/fpdfdoc/cpvt_fontmap.h" #include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fpdfdoc/pdf_vt.h" -#include "core/include/fpdfdoc/fpdf_doc.h" namespace { diff --git a/core/fpdfdoc/doc_action.cpp b/core/fpdfdoc/doc_action.cpp index 9a43b58e98..c3ab552606 100644 --- a/core/fpdfdoc/doc_action.cpp +++ b/core/fpdfdoc/doc_action.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" namespace { diff --git a/core/fpdfdoc/doc_annot.cpp b/core/fpdfdoc/doc_annot.cpp index 0e3d2a56bd..d1942eccd0 100644 --- a/core/fpdfdoc/doc_annot.cpp +++ b/core/fpdfdoc/doc_annot.cpp @@ -13,8 +13,8 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" #include "core/fpdfdoc/cpvt_generateap.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxge/include/fx_ge.h" -#include "core/include/fpdfdoc/fpdf_doc.h" CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) : m_pDocument(pPage->m_pDocument) { diff --git a/core/fpdfdoc/doc_basic.cpp b/core/fpdfdoc/doc_basic.cpp index 744475e505..9318387f7f 100644 --- a/core/fpdfdoc/doc_basic.cpp +++ b/core/fpdfdoc/doc_basic.cpp @@ -7,7 +7,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfdoc/doc_utils.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" namespace { diff --git a/core/fpdfdoc/doc_basic_unittest.cpp b/core/fpdfdoc/doc_basic_unittest.cpp index 0ab70c9304..5713a6debb 100644 --- a/core/fpdfdoc/doc_basic_unittest.cpp +++ b/core/fpdfdoc/doc_basic_unittest.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include <memory> #include <vector> diff --git a/core/fpdfdoc/doc_bookmark.cpp b/core/fpdfdoc/doc_bookmark.cpp index 35a04043fe..18e6174621 100644 --- a/core/fpdfdoc/doc_bookmark.cpp +++ b/core/fpdfdoc/doc_bookmark.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild( const CPDF_Bookmark& parent) const { diff --git a/core/fpdfdoc/doc_form.cpp b/core/fpdfdoc/doc_form.cpp index aa4b5c9f30..80c09714a2 100644 --- a/core/fpdfdoc/doc_form.cpp +++ b/core/fpdfdoc/doc_form.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfdoc/doc_utils.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfdoc/doc_formcontrol.cpp b/core/fpdfdoc/doc_formcontrol.cpp index 0a0a8c9a03..6435cfd76c 100644 --- a/core/fpdfdoc/doc_formcontrol.cpp +++ b/core/fpdfdoc/doc_formcontrol.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict) { diff --git a/core/fpdfdoc/doc_formfield.cpp b/core/fpdfdoc/doc_formfield.cpp index 931f9e18d9..1adc92ae4f 100644 --- a/core/fpdfdoc/doc_formfield.cpp +++ b/core/fpdfdoc/doc_formfield.cpp @@ -12,7 +12,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfdoc/cpvt_generateap.h" #include "core/fpdfdoc/doc_utils.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) { FX_BOOL bUnison = FALSE; diff --git a/core/fpdfdoc/doc_link.cpp b/core/fpdfdoc/doc_link.cpp index d86bf203e4..8f8d0d158c 100644 --- a/core/fpdfdoc/doc_link.cpp +++ b/core/fpdfdoc/doc_link.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include <vector> diff --git a/core/fpdfdoc/doc_metadata.cpp b/core/fpdfdoc/doc_metadata.cpp index c466193055..f36250ab7a 100644 --- a/core/fpdfdoc/doc_metadata.cpp +++ b/core/fpdfdoc/doc_metadata.cpp @@ -7,8 +7,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_xml.h" -#include "core/include/fpdfdoc/fpdf_doc.h" CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) { CPDF_Dictionary* pRoot = pDoc->GetRoot(); diff --git a/core/fpdfdoc/doc_ocg.cpp b/core/fpdfdoc/doc_ocg.cpp index 7464936b62..02b6eb115e 100644 --- a/core/fpdfdoc/doc_ocg.cpp +++ b/core/fpdfdoc/doc_ocg.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object* pObject, const CPDF_Dictionary* pGroupDict) { diff --git a/core/fpdfdoc/doc_tagged.cpp b/core/fpdfdoc/doc_tagged.cpp index 2a3554c499..94c143d51c 100644 --- a/core/fpdfdoc/doc_tagged.cpp +++ b/core/fpdfdoc/doc_tagged.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfdoc/doc_utils.h" +#include "core/fpdfdoc/include/fpdf_tagged.h" #include "core/fpdfdoc/tagged_int.h" -#include "core/include/fpdfdoc/fpdf_tagged.h" const int nMaxRecursion = 32; static FX_BOOL IsTagged(const CPDF_Document* pDoc) { diff --git a/core/fpdfdoc/doc_utils.cpp b/core/fpdfdoc/doc_utils.cpp index 0d91b20e8a..7e7fa8110f 100644 --- a/core/fpdfdoc/doc_utils.cpp +++ b/core/fpdfdoc/doc_utils.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" #include "core/fpdfdoc/doc_utils.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxge/include/fx_font.h" -#include "core/include/fpdfdoc/fpdf_doc.h" namespace { diff --git a/core/fpdfdoc/doc_viewerPreferences.cpp b/core/fpdfdoc/doc_viewerPreferences.cpp index 035d192395..a355635bf0 100644 --- a/core/fpdfdoc/doc_viewerPreferences.cpp +++ b/core/fpdfdoc/doc_viewerPreferences.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" CPDF_ViewerPreferences::CPDF_ViewerPreferences(CPDF_Document* pDoc) : m_pDoc(pDoc) {} diff --git a/core/fpdfdoc/doc_vt.cpp b/core/fpdfdoc/doc_vt.cpp index fa3d3a2dc2..b728c68af6 100644 --- a/core/fpdfdoc/doc_vt.cpp +++ b/core/fpdfdoc/doc_vt.cpp @@ -9,8 +9,8 @@ #include "core/fpdfdoc/cpvt_wordinfo.h" #include "core/fpdfdoc/csection.h" #include "core/fpdfdoc/include/cpdf_variabletext.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fpdfdoc/pdf_vt.h" -#include "core/include/fpdfdoc/fpdf_doc.h" CLine::CLine() {} CLine::~CLine() {} diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/fpdfdoc/include/fpdf_doc.h index 9cd6d1c408..e33b60165b 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/fpdfdoc/include/fpdf_doc.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_ -#define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_ +#ifndef CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_ +#define CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_ #include <map> #include <memory> @@ -724,9 +724,7 @@ class CPDF_FormField { int FindOptionValue(const CFX_WideString& csOptValue); - FX_BOOL CheckControl(int iControlIndex, - bool bChecked, - bool bNotify = false); + FX_BOOL CheckControl(int iControlIndex, bool bChecked, bool bNotify = false); int GetTopVisibleIndex(); @@ -1052,4 +1050,4 @@ class CPDF_ApSettings { CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath); -#endif // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_ +#endif // CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_ diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/fpdfdoc/include/fpdf_tagged.h index 46d9fe2137..807f178229 100644 --- a/core/include/fpdfdoc/fpdf_tagged.h +++ b/core/fpdfdoc/include/fpdf_tagged.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_ -#define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_ +#ifndef CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ +#define CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ #include "core/fxge/include/fx_dib.h" @@ -101,4 +101,4 @@ class CPDF_StructElement { int subindex = -1) = 0; }; -#endif // CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_ +#endif // CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ diff --git a/core/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h index 4877069bf6..f6e845a7af 100644 --- a/core/fpdfdoc/tagged_int.h +++ b/core/fpdfdoc/tagged_int.h @@ -9,7 +9,7 @@ #include <map> -#include "core/include/fpdfdoc/fpdf_tagged.h" +#include "core/fpdfdoc/include/fpdf_tagged.h" class CPDF_StructElementImpl; diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 99e35b4151..9fa01ac925 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -6,6 +6,7 @@ include_rules = [ '+core/fpdfapi/fpdf_page/include', '+core/fpdfapi/fpdf_parser/include', '+core/fpdfapi/fpdf_render/include', + '+core/fpdfdoc/include', '+core/fxcrt/include', '+core/fxge/include', '+public', diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index e9c58b24ee..d36b1cc34e 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" -#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 3faf26aceb..0d0e86f12d 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -7,10 +7,10 @@ #include "public/fpdf_text.h" #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fpdftext/include/ipdf_linkextract.h" #include "core/fpdftext/include/ipdf_textpage.h" #include "core/fpdftext/include/ipdf_textpagefind.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index a8022b0695..bf2ebd3eba 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -10,8 +10,8 @@ #include <memory> #include <set> +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_string.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "fpdfsdk/include/fsdk_baseform.h" class CPDFSDK_Annot; diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index a8f4a67381..4756bdbdba 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -13,8 +13,8 @@ #include <ctime> #endif +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_basic.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fx_systemhandler.h" diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 2ee130feb3..084347f53b 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -10,9 +10,9 @@ #include <map> #include <vector> +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxge/include/fx_dib.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "fpdfsdk/include/fsdk_baseannot.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d5f752c49b..f3ed2da00f 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -8,9 +8,9 @@ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxge/include/fx_ge.h" #include "core/fxge/include/fx_ge_win32.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h index f05b1e6784..7cad1cc664 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/pdfwindow/PWL_Wnd.h @@ -9,8 +9,8 @@ #include <vector> +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_basic.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "fpdfsdk/include/fx_systemhandler.h" class CPWL_MsgControl; diff --git a/pdfium.gyp b/pdfium.gyp index 91e31fd652..1815f9d6f3 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -219,8 +219,8 @@ 'target_name': 'fpdfdoc', 'type': 'static_library', 'sources': [ - 'core/include/fpdfdoc/fpdf_doc.h', - 'core/include/fpdfdoc/fpdf_tagged.h', + 'core/fpdfdoc/include/fpdf_doc.h', + 'core/fpdfdoc/include/fpdf_tagged.h', 'core/fpdfdoc/cpdf_variabletext.cpp', 'core/fpdfdoc/cpvt_color.cpp', 'core/fpdfdoc/cpvt_color.h', diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS index a1911963de..7c067f228f 100644 --- a/xfa/fxfa/app/DEPS +++ b/xfa/fxfa/app/DEPS @@ -3,4 +3,5 @@ include_rules = [ '+core/fpdfapi/fpdf_font/include', '+core/fpdfapi/fpdf_page/include', '+core/fpdfapi/fpdf_parser/include', + '+core/fpdfdoc/include', ] diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index acbddb4cf0..5baebb152a 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -8,9 +8,9 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" +#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_memory.h" -#include "core/include/fpdfdoc/fpdf_doc.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fwl/core/ifwl_notedriver.h" |