From ac19d2d8f64ab87577f167e0a8df075a7fe3ffdc Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 11 May 2015 14:27:24 -0700 Subject: Create top-level public/ header directory. These are the only files that embedders of PDFium should be including. They are entirely self-contained, and compile cleanly against -Wall so as to not offend the code that may include them. Having done this, we can see that chromium is pulling in two additional files from the fpdfsdk/include/pdfwindow directory, which is not guaranteed to work. A few files are renamed, adding an "_" to make the names consistent. The exception is fpdfview, which is doc'd as such in the doc. Naturally, paths will need updating in a handful of files in chrome when this rolls in. BUG=pdfium:154 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1135913002 --- fpdfsdk/src/fpdf_dataavail.cpp | 2 +- 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 | 2 +- fpdfsdk/src/fpdfeditpage.cpp | 2 +- fpdfsdk/src/fpdfformfill.cpp | 4 ++-- fpdfsdk/src/fpdfformfill_embeddertest.cpp | 2 +- fpdfsdk/src/fpdfppo.cpp | 2 +- fpdfsdk/src/fpdfsave.cpp | 5 +++-- fpdfsdk/src/fpdftext.cpp | 2 +- fpdfsdk/src/fpdftext_embeddertest.cpp | 4 ++-- fpdfsdk/src/fpdfview.cpp | 6 +++--- fpdfsdk/src/fpdfview_embeddertest.cpp | 2 +- fpdfsdk/src/fsdk_mgr.cpp | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index 0f9e9561e6..f31685f6d8 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_dataavail.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_dataavail.h" extern void ProcessParseError(FX_DWORD err_code); class CFPDF_FileAvailWrap : public IFX_FileAvail diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp index 6081fa52ac..3207802d48 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 c454756ce9..2dc8d78a29 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" #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 51e208fc93..4fea6a973c 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" typedef CFX_ArrayTemplate CPDF_ObjectArray; typedef CFX_ArrayTemplate CPDF_RectArray; diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 6b433a2a4f..a5d6c13b91 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" extern void (*Func_RenderPage)( CRenderContext*, FPDF_PAGE page, int start_x, int start_y, int size_x, int size_y, 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 e916b12069..9be2fe9223 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 cfe1688f68..613bae1433 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" DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, float left, float bottom, float right, float top) { diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 52d88b276e..b89ce26714 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../include/fsdk_define.h" -#include "../include/fpdfdoc.h" +#include "../../public/fpdf_doc.h" static int THISMODULE = 0; 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 6e7e1965b5..f06564e915 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -4,8 +4,8 @@ // 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" DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index e7c8db820c..e13c4809cf 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,8 +4,8 @@ // 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" #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 0f94733347..304226f8f1 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/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 c68ae68ebf..e8bd76d414 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" class CPDF_PageOrganizer diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 45dfbf7214..68b9b4c933 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" +#include "../../public/fpdf_save.h" #include "../include/fsdk_define.h" -#include "../include/fpdfsave.h" -#include "../include/fpdfedit.h" + #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 63de4433b3..a25b153cd4 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" #ifdef _WIN32 #include 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 3c0e010465..d977996232 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -6,10 +6,10 @@ #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 "../../public/fpdfview.h" +#include "../../public/fpdf_progressive.h" +#include "../../public/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" diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp index 47119b5c52..b8f692111a 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/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 9e0b230439..e6be9bd737 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" -#include "../include/fpdf_ext.h" #include "../include/formfiller/FFL_FormFiller.h" #include "../include/javascript/IJavaScript.h" -- cgit v1.2.3