diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
| commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
| tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /fpdfsdk/src/javascript | |
| parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
| download | pdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.tar.xz | |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'fpdfsdk/src/javascript')
| -rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Object.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/app.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 4c7e1910cb..d9ef6af52d 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -6,7 +6,6 @@ #include "Document.h" -#include "../../../third_party/base/numerics/safe_math.h" #include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "../../include/javascript/IJavaScript.h" #include "Field.h" @@ -19,6 +18,7 @@ #include "JS_Value.h" #include "app.h" #include "resource.h" +#include "third_party/base/numerics/safe_math.h" static v8::Isolate* GetIsolate(IJS_Context* cc) { CJS_Context* pContext = (CJS_Context*)cc; diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index 50751523f5..8872a4eca4 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -9,10 +9,10 @@ #include <map> -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fsdk_define.h" // For FX_UINT #include "../../include/jsapi/fxjs_v8.h" #include "JS_Runtime.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJS_Context; class CJS_Object; diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp index a7b081faf7..1232001609 100644 --- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "../../include/javascript/IJavaScript.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJS_ContextStub final : public IJS_Context { public: diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index 1bd089a431..d223934bbd 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -6,7 +6,6 @@ #include "app.h" -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "../../include/javascript/IJavaScript.h" #include "Document.h" @@ -17,6 +16,7 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "resource.h" +#include "third_party/base/nonstd_unique_ptr.h" BEGIN_JS_STATIC_CONST(CJS_TimerObj) END_JS_STATIC_CONST() |