From 1ed8a21d5c26a9d78240d7d56850a1a4738d3f9c Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 11 May 2015 15:25:39 -0700 Subject: Merge to XFA: Create top-level public/ header directory. Original Review URL: https://codereview.chromium.org/1135913002 BUG=pdfium:154 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1136703003 --- fpdfsdk/src/fpdf_dataavail.cpp | 4 ++-- fpdfsdk/src/fpdf_dataavail_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdf_ext.cpp | 2 +- fpdfsdk/src/fpdf_flatten.cpp | 2 +- fpdfsdk/src/fpdf_progressive.cpp | 4 ++-- fpdfsdk/src/fpdf_searchex.cpp | 3 +-- fpdfsdk/src/fpdf_sysfontinfo.cpp | 2 +- fpdfsdk/src/fpdf_transformpage.cpp | 2 +- fpdfsdk/src/fpdfdoc.cpp | 2 +- fpdfsdk/src/fpdfdoc_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdfeditimg.cpp | 3 +-- fpdfsdk/src/fpdfeditpage.cpp | 5 ++--- fpdfsdk/src/fpdfformfill.cpp | 4 ++-- fpdfsdk/src/fpdfformfill_embeddertest.cpp | 2 +- fpdfsdk/src/fpdfppo.cpp | 2 +- fpdfsdk/src/fpdfsave.cpp | 7 ++++--- fpdfsdk/src/fpdftext.cpp | 2 +- fpdfsdk/src/fpdftext_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdfview.cpp | 8 ++++---- fpdfsdk/src/fpdfview_embeddertest.cpp | 2 +- fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp | 2 +- fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 2 +- fpdfsdk/src/fsdk_mgr.cpp | 2 +- 23 files changed, 36 insertions(+), 38 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index a04e7a2120..f3fd42a369 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_dataavail.h" +#include "../../public/fpdf_formfill.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_dataavail.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_app.h" extern void ProcessParseError(FX_DWORD err_code); diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp index 31977ac534..d2f0b78b52 100644 --- a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp +++ b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "../../public/fpdf_doc.h" +#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" -#include "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdfdoc.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFDataAvailEmbeddertest : public EmbedderTest { diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index 0ba66724fd..ae9cb9e44e 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_ext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index c7ef4b50d8..9356db9842 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_flatten.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_flatten.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 5226770d48..bd8d86434f 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdf_progressive.h" +#include "../../public/fpdf_progressive.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" -#include "../include/fpdfview.h" #include "../include/fsdk_rendercontext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp index 21831a3e3d..4384cdc5b3 100644 --- a/fpdfsdk/src/fpdf_searchex.cpp +++ b/fpdfsdk/src/fpdf_searchex.cpp @@ -4,9 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_searchex.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_searchex.h" - DLLEXPORT int STDCALL FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex) { diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index f60dc9723e..603bb62250 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_sysfontinfo.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_sysfontinfo.h" class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo { diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 043c02cc27..592b5f4e64 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_transformpage.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_transformpage.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 7e11565ad7..d662699dbf 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_doc.h" #include "../include/fsdk_define.h" -#include "../include/fpdfdoc.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp index dadaf1d809..1f11bef214 100644 --- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "../../public/fpdf_doc.h" +#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" -#include "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdfdoc.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFDocEmbeddertest : public EmbedderTest { diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index 188b5f070d..aba8d0b7b2 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -4,12 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" #include "../include/fsdk_define.h" -#include "../include/fpdfedit.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" - DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { if (!document) diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index 43d74aad04..f371f82df3 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,14 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" +#include "../../public/fpdf_formfill.h" #include "../include/fsdk_define.h" -#include "../include/fpdfedit.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_page.h" - #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index ea94925d63..7482871527 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdfview.h" -#include "../include/fpdfformfill.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fsdk_mgr.h" diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp index 3fe34d5d8c..7c3988c445 100644 --- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. -#include "../../fpdfsdk/include/fpdfformfill.h" +#include "../../public/fpdf_formfill.h" #include "../../testing/embedder_test.h" #include "../../testing/embedder_test_mock_delegate.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index b3bc0f144e..21cf647dd6 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdfppo.h" +#include "../../public/fpdf_ppo.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index de645a2841..0be1709f37 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdf_save.h" #include "../include/fsdk_define.h" -#include "../include/fpdfsave.h" -#include "../include/fpdfedit.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_util.h" + #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 776a1b66c7..951cde047c 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_text.h" #include "../include/fsdk_define.h" -#include "../include/fpdftext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp index f0d9feb91d..394e1a96b3 100644 --- a/fpdfsdk/src/fpdftext_embeddertest.cpp +++ b/fpdfsdk/src/fpdftext_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "../../public/fpdf_text.h" +#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" -#include "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdftext.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index c0b65cae05..7852670999 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdf_progressive.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" -#include "../include/fpdfview.h" #include "../include/fsdk_rendercontext.h" -#include "../include/fpdf_progressive.h" -#include "../include/fpdf_ext.h" #include "../../../core/src/fxcrt/fx_safe_types.h" #include "../../third_party/base/nonstd_unique_ptr.h" #include "../../third_party/base/numerics/safe_conversions_impl.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp index 66fbe464d0..d7223245ca 100644 --- a/fpdfsdk/src/fpdfview_embeddertest.cpp +++ b/fpdfsdk/src/fpdfview_embeddertest.cpp @@ -5,8 +5,8 @@ #include #include +#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" -#include "../../fpdfsdk/include/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFViewEmbeddertest : public EmbedderTest { diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index 7abd2741a0..94164f12b8 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../public/fpdf_formfill.h" #include "../../include/fsdk_define.h" -#include "../../include/fpdfformfill.h" #include "../../include/fsdk_mgr.h" #include "../../include/fpdfxfa/fpdfxfa_doc.h" #include "../../include/fpdfxfa/fpdfxfa_util.h" diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 87fb9d21ce..c3137f51c6 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../public/fpdf_formfill.h" #include "../../include/fsdk_define.h" #include "../../include/fpdfxfa/fpdfxfa_doc.h" -#include "../../include/fpdfformfill.h" #include "../../include/fsdk_mgr.h" #include "../../include/fpdfxfa/fpdfxfa_app.h" #include "../../include/fpdfxfa/fpdfxfa_util.h" diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 7b071a9b55..e783532ca2 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fpdfxfa/fpdfxfa_util.h" #include "../include/fsdk_mgr.h" -#include "../include/fpdf_ext.h" #include "../include/formfiller/FFL_FormFiller.h" #include "../include/javascript/IJavaScript.h" #include "../include/fpdfxfa/fpdfxfa_app.h" -- cgit v1.2.3