From 13ee55a8267963c9b39486a6a22646fbdd770742 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 14 Mar 2016 15:56:00 -0400 Subject: Move fx_crypto.h and fpdf_text.h out of core/include. This CL moves the two files and breaks fpdf_text.h apart into individual pieces. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1801973002 . --- fpdfsdk/DEPS | 1 + fpdfsdk/fpdf_searchex.cpp | 2 +- fpdfsdk/fpdftext.cpp | 4 +++- fpdfsdk/include/fsdk_mgr.h | 1 - fpdfsdk/javascript/DEPS | 1 + fpdfsdk/javascript/JS_GlobalData.cpp | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 488a3963c1..ed111888c8 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -1,5 +1,6 @@ include_rules = [ '+core/include', + '+core/fpdftext/include', '+javascript/IJavaScript.h', '+public', '+v8', diff --git a/fpdfsdk/fpdf_searchex.cpp b/fpdfsdk/fpdf_searchex.cpp index 96c5e53309..ab2baf529c 100644 --- a/fpdfsdk/fpdf_searchex.cpp +++ b/fpdfsdk/fpdf_searchex.cpp @@ -6,7 +6,7 @@ #include "public/fpdf_searchex.h" -#include "core/include/fpdftext/fpdf_text.h" +#include "core/fpdftext/include/ipdf_textpage.h" DLLEXPORT int STDCALL FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex) { diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 80d56920bc..3e64d8e2c4 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -6,8 +6,10 @@ #include "public/fpdf_text.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 "core/include/fpdftext/fpdf_text.h" #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 6543000d4f..0073377893 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,7 +12,6 @@ #include #include "core/include/fpdfapi/cpdf_document.h" -#include "core/include/fpdftext/fpdf_text.h" #include "fpdfsdk/include/fsdk_actionhandler.h" #include "fpdfsdk/include/fsdk_annothandler.h" #include "fpdfsdk/include/fsdk_baseannot.h" diff --git a/fpdfsdk/javascript/DEPS b/fpdfsdk/javascript/DEPS index 4b3f3dd3d0..a1f0ec3a5e 100644 --- a/fpdfsdk/javascript/DEPS +++ b/fpdfsdk/javascript/DEPS @@ -1,3 +1,4 @@ include_rules = [ + '+core/fdrm/crypto/include', '+xfa/fxjse' ] diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp index 1408dbe33d..ba547fe79e 100644 --- a/fpdfsdk/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/javascript/JS_GlobalData.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/javascript/JS_GlobalData.h" -#include "core/include/fdrm/fx_crypt.h" +#include "core/fdrm/crypto/include/fx_crypt.h" #include "fpdfsdk/include/javascript/IJavaScript.h" #define JS_MAXGLOBALDATA (1024 * 4 - 8) -- cgit v1.2.3