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/include | |
parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
download | pdfium-chromium/2560.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/include')
-rw-r--r-- | fpdfsdk/include/fsdk_actionhandler.h | 2 | ||||
-rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 10 |
2 files changed, 6 insertions, 6 deletions
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; |