summaryrefslogtreecommitdiff
path: root/core/include/fpdfdoc
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-06 14:38:48 -0800
committerLei Zhang <thestig@chromium.org>2015-11-06 14:38:48 -0800
commit8241df7edc53b8777e7f71ff379fa53f368c3a28 (patch)
tree418c3950809d05c00fad9a39a30e1d324e68cb8b /core/include/fpdfdoc
parentde383c5d8c0b418a5d5b55d5a4ead715e69255c5 (diff)
downloadpdfium-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 'core/include/fpdfdoc')
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index cc5cf08005..e593471e53 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -10,9 +10,9 @@
#include <map>
#include <vector>
-#include "../../../third_party/base/nonstd_unique_ptr.h"
#include "../fpdfapi/fpdf_parser.h"
#include "../fpdfapi/fpdf_render.h"
+#include "third_party/base/nonstd_unique_ptr.h"
class CFieldTree;
class CPDF_AAction;