From b4e7f304af0ad92d20f952e6634000d177974f47 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 6 Nov 2015 15:52:32 -0800 Subject: Merge to XFA: Fix all relative includes to public. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1415803007 . (cherry picked from commit 5899671184d01b74989d181363066379ef3e4051) Review URL: https://codereview.chromium.org/1431593007 . --- fpdfsdk/src/fpdf_dataavail.cpp | 5 +++-- fpdfsdk/src/fpdf_dataavail_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdf_ext.cpp | 3 ++- fpdfsdk/src/fpdf_flatten.cpp | 3 ++- fpdfsdk/src/fpdf_progressive.cpp | 5 +++-- fpdfsdk/src/fpdf_searchex.cpp | 2 +- fpdfsdk/src/fpdf_sysfontinfo.cpp | 3 ++- fpdfsdk/src/fpdf_transformpage.cpp | 3 ++- fpdfsdk/src/fpdfdoc.cpp | 3 ++- fpdfsdk/src/fpdfdoc_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdfeditimg.cpp | 3 ++- fpdfsdk/src/fpdfeditpage.cpp | 5 +++-- fpdfsdk/src/fpdfformfill.cpp | 5 +++-- fpdfsdk/src/fpdfformfill_embeddertest.cpp | 2 +- fpdfsdk/src/fpdfppo.cpp | 3 ++- fpdfsdk/src/fpdfsave.cpp | 11 ++++++----- fpdfsdk/src/fpdftext.cpp | 3 ++- fpdfsdk/src/fpdftext_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdfview.cpp | 9 +++++---- fpdfsdk/src/fpdfview_c_api_test.c | 30 ++++++++++++++--------------- 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 | 5 +++-- 24 files changed, 68 insertions(+), 53 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index 0a90f49d8b..4d96a7ca26 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_dataavail.h" -#include "../../public/fpdf_formfill.h" +#include "public/fpdf_dataavail.h" + #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" +#include "public/fpdf_formfill.h" class CFPDF_FileAvailWrap : public IFX_FileAvail { public: diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp index 730a793d63..ee4c3e6104 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 "public/fpdf_doc.h" +#include "public/fpdfview.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 aead361c9a..74ff88022f 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdf_ext.h" + #include "../../core/include/fxcrt/fx_xml.h" -#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 75db8f806d..a816750912 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_flatten.h" +#include "public/fpdf_flatten.h" + #include "../include/fsdk_define.h" typedef CFX_ArrayTemplate CPDF_ObjectArray; diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index b125b1cffe..0628c6268e 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_progressive.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_progressive.h" + #include "../include/fsdk_define.h" #include "../include/fsdk_rendercontext.h" +#include "public/fpdfview.h" // These checks are here because core/ and public/ cannot depend on each other. static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER, diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp index 9747316305..2e0cb568fa 100644 --- a/fpdfsdk/src/fpdf_searchex.cpp +++ b/fpdfsdk/src/fpdf_searchex.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_searchex.h" +#include "public/fpdf_searchex.h" #include "../../core/include/fpdftext/fpdf_text.h" diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index a004e86ba1..9c388292a8 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_sysfontinfo.h" +#include "public/fpdf_sysfontinfo.h" + #include "../include/fsdk_define.h" #include "../include/pdfwindow/PWL_FontMap.h" diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 8a835fb220..134117dcd3 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_transformpage.h" +#include "public/fpdf_transformpage.h" + #include "../include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 8a4d619292..72231eb1cc 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_doc.h" +#include "public/fpdf_doc.h" + #include "../include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp index c83b2eb958..ca5cbebf01 100644 --- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "../../core/include/fxcrt/fx_string.h" -#include "../../public/fpdf_doc.h" -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" #include "../../testing/fx_string_testhelpers.h" +#include "public/fpdf_doc.h" +#include "public/fpdfview.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 73fc251195..c4fa2d654e 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_edit.h" +#include "public/fpdf_edit.h" + #include "../include/fsdk_define.h" DLLEXPORT FPDF_PAGEOBJECT STDCALL diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index b3a52991d2..bb87c4caeb 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_edit.h" -#include "../../public/fpdf_formfill.h" +#include "public/fpdf_edit.h" + #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_page.h" +#include "public/fpdf_formfill.h" #if _FX_OS_ == _FX_ANDROID_ #include "time.h" diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index d7fb2e4cef..9dab5fdb5d 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_formfill.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_formfill.h" + #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" +#include "public/fpdfview.h" #include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp index 53cdcbd041..f6d444abed 100644 --- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../public/fpdf_formfill.h" #include "../../testing/embedder_test.h" #include "../../testing/embedder_test_mock_delegate.h" #include "../../testing/embedder_test_timer_handling_delegate.h" +#include "public/fpdf_formfill.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 0623e7ee85..87c7bcdb6a 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_ppo.h" +#include "public/fpdf_ppo.h" + #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fsdk_define.h" diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 3a85ba750c..a9e285ad84 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/fpdfxfa/fpdfxfa_doc.h" +#include "public/fpdf_save.h" + #include "../include/fpdfxfa/fpdfxfa_app.h" +#include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_util.h" +#include "../include/fsdk_define.h" +#include "public/fpdf_edit.h" +#include "public/fpdf_formfill.h" #if _FX_OS_ == _FX_ANDROID_ #include "time.h" diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 99f282a2b5..333ef3b9a1 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdf_text.h" + #include "../../core/include/fpdfdoc/fpdf_doc.h" #include "../../core/include/fpdftext/fpdf_text.h" -#include "../../public/fpdf_text.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 b3fe9e4c1e..52cec7028a 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 "public/fpdf_text.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 04908658f0..31d94770fa 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdfview.h" + #include "../../core/include/fpdfapi/fpdf_module.h" #include "../../core/include/fxcodec/fx_codec.h" #include "../../core/include/fxcrt/fx_safe_types.h" -#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/fsdk_rendercontext.h" @@ -19,6 +17,9 @@ #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fpdfxfa/fpdfxfa_util.h" #include "../include/javascript/IJavaScript.h" +#include "public/fpdf_ext.h" +#include "public/fpdf_formfill.h" +#include "public/fpdf_progressive.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/numerics/safe_conversions_impl.h" diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c index 4205ca119e..344b029eba 100644 --- a/fpdfsdk/src/fpdfview_c_api_test.c +++ b/fpdfsdk/src/fpdfview_c_api_test.c @@ -9,21 +9,21 @@ #include "fpdfview_c_api_test.h" -#include "../../public/fpdf_dataavail.h" -#include "../../public/fpdf_doc.h" -#include "../../public/fpdf_edit.h" -#include "../../public/fpdf_ext.h" -#include "../../public/fpdf_flatten.h" -#include "../../public/fpdf_formfill.h" -#include "../../public/fpdf_fwlevent.h" -#include "../../public/fpdf_ppo.h" -#include "../../public/fpdf_progressive.h" -#include "../../public/fpdf_save.h" -#include "../../public/fpdf_searchex.h" -#include "../../public/fpdf_sysfontinfo.h" -#include "../../public/fpdf_text.h" -#include "../../public/fpdf_transformpage.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_dataavail.h" +#include "public/fpdf_doc.h" +#include "public/fpdf_edit.h" +#include "public/fpdf_ext.h" +#include "public/fpdf_flatten.h" +#include "public/fpdf_formfill.h" +#include "public/fpdf_fwlevent.h" +#include "public/fpdf_ppo.h" +#include "public/fpdf_progressive.h" +#include "public/fpdf_save.h" +#include "public/fpdf_searchex.h" +#include "public/fpdf_sysfontinfo.h" +#include "public/fpdf_text.h" +#include "public/fpdf_transformpage.h" +#include "public/fpdfview.h" // Scheme for avoiding LTO out of existence, warnings, etc. typedef void (*fnptr)(void); // Legal generic function type for casts. diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp index 36e79d777a..2a00193a5e 100644 --- a/fpdfsdk/src/fpdfview_embeddertest.cpp +++ b/fpdfsdk/src/fpdfview_embeddertest.cpp @@ -5,9 +5,9 @@ #include #include -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" #include "fpdfview_c_api_test.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" TEST(fpdf, CApiTest) { diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index bc19903bad..0ff2ac7728 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../public/fpdf_formfill.h" #include "../../include/fsdk_define.h" #include "../../include/fsdk_mgr.h" #include "../../include/fpdfxfa/fpdfxfa_doc.h" #include "../../include/fpdfxfa/fpdfxfa_util.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/fpdfxfa/fpdfxfa_app.h" +#include "public/fpdf_formfill.h" CPDFXFA_App* CPDFXFA_App::g_pApp = NULL; diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 3763003dca..b188035ccc 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -4,7 +4,6 @@ // 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/fsdk_mgr.h" @@ -12,6 +11,7 @@ #include "../../include/fpdfxfa/fpdfxfa_util.h" #include "../../include/fpdfxfa/fpdfxfa_page.h" #include "../../include/javascript/IJavaScript.h" +#include "public/fpdf_formfill.h" #define IDS_XFA_Validate_Input \ "At least one required field was empty. Please fill in the required " \ diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 9db5f913c5..9bbf7aae3f 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -6,11 +6,12 @@ #include -#include "../../public/fpdf_ext.h" +#include "../include/fsdk_mgr.h" + #include "../include/formfiller/FFL_FormFiller.h" #include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" #include "../include/javascript/IJavaScript.h" +#include "public/fpdf_ext.h" #include "third_party/base/nonstd_unique_ptr.h" #include "../include/fpdfxfa/fpdfxfa_app.h" -- cgit v1.2.3