From 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 5 Nov 2015 18:39:40 -0800 Subject: Fix all relative includes to third_party. - 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 . --- fpdfsdk/include/fsdk_actionhandler.h | 2 +- fpdfsdk/include/fsdk_mgr.h | 10 +++++----- fpdfsdk/src/fpdfformfill.cpp | 2 +- fpdfsdk/src/fpdfppo.cpp | 2 +- fpdfsdk/src/fpdfview.cpp | 4 ++-- fpdfsdk/src/fsdk_baseform.cpp | 10 +++++----- fpdfsdk/src/fsdk_mgr.cpp | 2 +- fpdfsdk/src/javascript/Document.cpp | 2 +- fpdfsdk/src/javascript/JS_Object.h | 2 +- fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 2 +- fpdfsdk/src/javascript/app.cpp | 2 +- fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 09f13ac5b8..9324b85239 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -9,8 +9,8 @@ #include "../../core/include/fpdfdoc/fpdf_doc.h" #include "../../core/include/fxcrt/fx_string.h" -#include "../../third_party/base/nonstd_unique_ptr.h" #include "fsdk_baseform.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_PtrList; class CPDFSDK_Annot; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 7502133dd0..32e640912c 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,15 +12,15 @@ #include "../../core/include/fpdftext/fpdf_text.h" #include "../../public/fpdf_formfill.h" #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define. -#include "../../third_party/base/nonstd_unique_ptr.h" +#include "fsdk_actionhandler.h" +#include "fsdk_annothandler.h" +#include "fsdk_baseannot.h" +#include "fsdk_baseform.h" #include "fsdk_common.h" #include "fsdk_define.h" #include "fx_systemhandler.h" -#include "fsdk_baseannot.h" -#include "fsdk_baseform.h" -#include "fsdk_annothandler.h" -#include "fsdk_actionhandler.h" #include "javascript/IJavaScript.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFFL_IFormFiller; class CPDFSDK_ActionHandler; diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index aa45855967..45204692fc 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -6,9 +6,9 @@ #include "../../public/fpdf_formfill.h" #include "../../public/fpdfview.h" -#include "../../third_party/base/nonstd_unique_ptr.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 6bdd7c5e67..6700a40a70 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../public/fpdf_ppo.h" -#include "../../third_party/base/nonstd_unique_ptr.h" #include "../include/fsdk_define.h" +#include "third_party/base/nonstd_unique_ptr.h" class CPDF_PageOrganizer { public: diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 97da89e296..b9bcf02841 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -9,12 +9,12 @@ #include "../../public/fpdf_ext.h" #include "../../public/fpdf_progressive.h" #include "../../public/fpdfview.h" -#include "../../third_party/base/nonstd_unique_ptr.h" -#include "../../third_party/base/numerics/safe_conversions_impl.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" #include "../include/fsdk_rendercontext.h" #include "../include/javascript/IJavaScript.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/base/numerics/safe_conversions_impl.h" CPDF_Document* CPDFDocumentFromFPDFDocument(FPDF_DOCUMENT doc) { return static_cast(doc); diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index bc2d137d70..2909dc0f0b 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../third_party/base/nonstd_unique_ptr.h" -#include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" -#include "../include/fsdk_baseannot.h" -#include "../include/fsdk_baseform.h" #include "../include/formfiller/FFL_FormFiller.h" #include "../include/fsdk_actionhandler.h" +#include "../include/fsdk_baseannot.h" +#include "../include/fsdk_baseform.h" +#include "../include/fsdk_define.h" +#include "../include/fsdk_mgr.h" +#include "third_party/base/nonstd_unique_ptr.h" #include "../include/javascript/IJavaScript.h" diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index f0035064f9..7a767ea579 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -7,11 +7,11 @@ #include #include "../../public/fpdf_ext.h" -#include "../../third_party/base/nonstd_unique_ptr.h" #include "../include/formfiller/FFL_FormFiller.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" #include "../include/javascript/IJavaScript.h" +#include "third_party/base/nonstd_unique_ptr.h" #if _FX_OS_ == _FX_ANDROID_ #include "time.h" 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 -#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() diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index b0f3f85167..a7baa7be09 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../../core/include/fpdfapi/fpdf_parser.h" #include "../../../testing/embedder_test.h" #include "../../include/jsapi/fxjs_v8.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { -- cgit v1.2.3