From 8241df7edc53b8777e7f71ff379fa53f368c3a28 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 6 Nov 2015 14:38:48 -0800 Subject: Merge to XFA: 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. - And fix XFA's lack of #includes. BUG=541704 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425153006 . (cherry picked from commit 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c) Review URL: https://codereview.chromium.org/1434543003 . --- fpdfsdk/include/fsdk_actionhandler.h | 2 +- fpdfsdk/include/fsdk_mgr.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/include') 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 1c0a48ded5..8a67145291 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,17 +12,17 @@ #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_common.h" -#include "fsdk_define.h" -#include "fx_systemhandler.h" #include "fpdfxfa/fpdfxfa_doc.h" #include "fpdfxfa/fpdfxfa_page.h" +#include "fsdk_actionhandler.h" +#include "fsdk_annothandler.h" #include "fsdk_baseannot.h" #include "fsdk_baseform.h" -#include "fsdk_annothandler.h" -#include "fsdk_actionhandler.h" +#include "fsdk_common.h" +#include "fsdk_define.h" +#include "fx_systemhandler.h" #include "javascript/IJavaScript.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFFL_IFormFiller; class CPDFSDK_ActionHandler; -- cgit v1.2.3