From bde53d25de8cba5657aa7f63a301288663fa58e5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 12 Nov 2015 22:21:30 -0800 Subject: Merge to XFA: Remove relative includes. That refer to parent directories. TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1434223002 . (cherry picked from commit 22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228) Review URL: https://codereview.chromium.org/1439223003 . --- fpdfsdk/src/javascript/Consts.cpp | 2 +- fpdfsdk/src/javascript/Document.cpp | 4 ++-- fpdfsdk/src/javascript/Field.cpp | 4 ++-- fpdfsdk/src/javascript/Field.h | 2 +- fpdfsdk/src/javascript/Icon.cpp | 2 +- fpdfsdk/src/javascript/JS_Context.cpp | 2 +- fpdfsdk/src/javascript/JS_Context.h | 2 +- fpdfsdk/src/javascript/JS_Define.h | 4 ++-- fpdfsdk/src/javascript/JS_EventHandler.cpp | 2 +- fpdfsdk/src/javascript/JS_GlobalData.cpp | 2 +- fpdfsdk/src/javascript/JS_Object.cpp | 4 ++-- fpdfsdk/src/javascript/JS_Object.h | 4 ++-- fpdfsdk/src/javascript/JS_Runtime.cpp | 4 ++-- fpdfsdk/src/javascript/JS_Runtime.h | 4 ++-- fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 4 ++-- fpdfsdk/src/javascript/JS_Value.h | 2 +- fpdfsdk/src/javascript/PublicMethods.cpp | 4 ++-- fpdfsdk/src/javascript/app.cpp | 4 ++-- fpdfsdk/src/javascript/color.cpp | 8 ++++---- fpdfsdk/src/javascript/color.h | 2 +- fpdfsdk/src/javascript/console.cpp | 6 +++--- fpdfsdk/src/javascript/event.cpp | 8 ++++---- fpdfsdk/src/javascript/global.cpp | 2 +- fpdfsdk/src/javascript/report.cpp | 2 +- fpdfsdk/src/javascript/resource.h | 2 +- fpdfsdk/src/javascript/util.cpp | 2 +- 26 files changed, 44 insertions(+), 44 deletions(-) (limited to 'fpdfsdk/src/javascript') diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index d71c71129d..7f6b8f8c6a 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -6,10 +6,10 @@ #include "Consts.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------------ border ------------------------------ */ diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 4bd0fd7430..a8da302700 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -6,8 +6,6 @@ #include "Document.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Field.h" #include "Icon.h" #include "JS_Context.h" @@ -17,6 +15,8 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "app.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "third_party/base/numerics/safe_math.h" diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 6287850bb6..4119b8c32e 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -6,8 +6,6 @@ #include "Field.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "Icon.h" #include "JS_Context.h" @@ -18,6 +16,8 @@ #include "JS_Value.h" #include "PublicMethods.h" #include "color.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- Field ---------------------- */ diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h index 4899ee2a96..cd817956d4 100644 --- a/fpdfsdk/src/javascript/Field.h +++ b/fpdfsdk/src/javascript/Field.h @@ -9,8 +9,8 @@ #include // For std::wstring. -#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. #include "JS_Define.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. class CPDFSDK_Widget; class Document; diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp index 5dfa7a08d4..bce66c0d99 100644 --- a/fpdfsdk/src/javascript/Icon.cpp +++ b/fpdfsdk/src/javascript/Icon.cpp @@ -6,10 +6,10 @@ #include "Icon.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- Icon ---------------------- */ diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index a53e745786..76988d5ef6 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -6,9 +6,9 @@ #include "JS_Context.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_EventHandler.h" #include "JS_Runtime.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" /* -------------------------- CJS_Context -------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_Context.h b/fpdfsdk/src/javascript/JS_Context.h index e450ba5703..93ef1523a3 100644 --- a/fpdfsdk/src/javascript/JS_Context.h +++ b/fpdfsdk/src/javascript/JS_Context.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_ -#include "../../include/javascript/IJavaScript.h" #include "core/include/fxcrt/fx_string.h" #include "core/include/fxcrt/fx_system.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" class CJS_EventHandler; class CJS_Runtime; diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h index 0a6426868f..740295e1cb 100644 --- a/fpdfsdk/src/javascript/JS_Define.h +++ b/fpdfsdk/src/javascript/JS_Define.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ -#include "../../include/jsapi/fxjs_v8.h" -#include "resource.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "resource.h" struct JSConstSpec { const wchar_t* pName; diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index cb86fde24d..df7f9791c2 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -6,7 +6,6 @@ #include "JS_EventHandler.h" -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "Field.h" #include "JS_Context.h" @@ -14,6 +13,7 @@ #include "JS_Object.h" #include "JS_Runtime.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------------- CJS_EventHandler ---------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 36b81a20ac..d9a07a8507 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -6,8 +6,8 @@ #include "JS_GlobalData.h" -#include "../../include/javascript/IJavaScript.h" #include "core/include/fdrm/fx_crypt.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #define JS_MAXGLOBALDATA (1024 * 4 - 8) diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 1e649ae791..529b540237 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -6,10 +6,10 @@ #include "JS_Object.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" namespace { diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index 8872a4eca4..d72696caeb 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -9,9 +9,9 @@ #include -#include "../../include/fsdk_define.h" // For FX_UINT -#include "../../include/jsapi/fxjs_v8.h" #include "JS_Runtime.h" +#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT +#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "third_party/base/nonstd_unique_ptr.h" class CJS_Context; diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 3e1f74beed..8f705d51fa 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -8,8 +8,6 @@ #include "../../../xfa/src/fxjse/src/value.h" #include "../../include/fpdfxfa/fpdfxfa_app.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Consts.h" #include "Document.h" #include "Field.h" @@ -25,6 +23,8 @@ #include "color.h" #include "console.h" #include "event.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "global.h" #include "report.h" #include "util.h" diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h index 9e6b3abede..2353517016 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.h +++ b/fpdfsdk/src/javascript/JS_Runtime.h @@ -11,10 +11,10 @@ #include #include -#include "../../include/javascript/IJavaScript.h" -#include "../../include/jsapi/fxjs_v8.h" #include "JS_EventHandler.h" #include "core/include/fxcrt/fx_basic.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" class CJS_Context; diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp index ba9b4a0d4a..90d19d9451 100644 --- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "third_party/base/nonstd_unique_ptr.h" class CJS_ContextStub final : public IJS_Context { diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h index 875ab18ca9..8517b76dac 100644 --- a/fpdfsdk/src/javascript/JS_Value.h +++ b/fpdfsdk/src/javascript/JS_Value.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_ -#include "../../include/jsapi/fxjs_v8.h" #include "core/include/fxcrt/fx_basic.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" class CJS_Array; class CJS_Date; diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index ac9669d564..454085069e 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -6,8 +6,6 @@ #include "PublicMethods.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Field.h" #include "JS_Context.h" #include "JS_Define.h" @@ -16,6 +14,8 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "color.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "util.h" diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index dd8223ce9a..f8b2e3550e 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -6,8 +6,6 @@ #include "app.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "JS_Context.h" #include "JS_Define.h" @@ -15,6 +13,8 @@ #include "JS_Object.h" #include "JS_Runtime.h" #include "JS_Value.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp index d00ac70e80..b9c4804727 100644 --- a/fpdfsdk/src/javascript/color.cpp +++ b/fpdfsdk/src/javascript/color.cpp @@ -6,13 +6,13 @@ #include "color.h" -#include "../../include/javascript/IJavaScript.h" +#include "JS_Context.h" #include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Value.h" #include "JS_EventHandler.h" -#include "JS_Context.h" +#include "JS_Object.h" #include "JS_Runtime.h" +#include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* -------------------------- color -------------------------- */ diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h index 360f66709c..0cc3f3c289 100644 --- a/fpdfsdk/src/javascript/color.h +++ b/fpdfsdk/src/javascript/color.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ #define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ -#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. #include "JS_Define.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. class color : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index f8dbd527d8..072e5b7f0d 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -6,12 +6,12 @@ #include "console.h" -#include "../../include/javascript/IJavaScript.h" +#include "JS_Context.h" #include "JS_Define.h" +#include "JS_EventHandler.h" #include "JS_Object.h" #include "JS_Value.h" -#include "JS_EventHandler.h" -#include "JS_Context.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------ console ------------------------ */ diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp index a6bd5dca1f..5ad1ca513f 100644 --- a/fpdfsdk/src/javascript/event.cpp +++ b/fpdfsdk/src/javascript/event.cpp @@ -6,13 +6,13 @@ #include "event.h" -#include "../../include/javascript/IJavaScript.h" +#include "Field.h" +#include "JS_Context.h" #include "JS_Define.h" +#include "JS_EventHandler.h" #include "JS_Object.h" #include "JS_Value.h" -#include "JS_EventHandler.h" -#include "JS_Context.h" -#include "Field.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* -------------------------- event -------------------------- */ diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index f7c71e88b1..2d9799dd4e 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -6,7 +6,6 @@ #include "global.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" #include "JS_EventHandler.h" @@ -14,6 +13,7 @@ #include "JS_Object.h" #include "JS_Value.h" #include "core/include/fxcrt/fx_ext.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" /* ---------------------------- global ---------------------------- */ diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp index 40fb682fbe..2ec07fb1e4 100644 --- a/fpdfsdk/src/javascript/report.cpp +++ b/fpdfsdk/src/javascript/report.cpp @@ -6,10 +6,10 @@ #include "report.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- report ---------------------- */ diff --git a/fpdfsdk/src/javascript/resource.h b/fpdfsdk/src/javascript/resource.h index 8e07d47768..be3ae13d90 100644 --- a/fpdfsdk/src/javascript/resource.h +++ b/fpdfsdk/src/javascript/resource.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_ #define FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_ -#include "../../include/fsdk_define.h" // For FX_UINT. #include "core/include/fxcrt/fx_string.h" // For CFX_WideString. +#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT. class CJS_Context; diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index 2c28cc55e3..c021ec9e95 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -6,7 +6,6 @@ #include "util.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" #include "JS_EventHandler.h" @@ -14,6 +13,7 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "PublicMethods.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #if _FX_OS_ == _FX_ANDROID_ -- cgit v1.2.3