diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
| commit | 8241df7edc53b8777e7f71ff379fa53f368c3a28 (patch) | |
| tree | 418c3950809d05c00fad9a39a30e1d324e68cb8b /fpdfsdk/include/fsdk_mgr.h | |
| parent | de383c5d8c0b418a5d5b55d5a4ead715e69255c5 (diff) | |
| download | pdfium-8241df7edc53b8777e7f71ff379fa53f368c3a28.tar.xz | |
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 .
Diffstat (limited to 'fpdfsdk/include/fsdk_mgr.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 12 |
1 files changed, 6 insertions, 6 deletions
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; |