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/src/fpdfview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/fpdfview.cpp') diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index b3c8137d0c..04908658f0 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -11,8 +11,6 @@ #include "../../public/fpdf_formfill.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" @@ -21,6 +19,8 @@ #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fpdfxfa/fpdfxfa_util.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 doc ? static_cast(doc)->GetPDFDoc() : nullptr; -- cgit v1.2.3