summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_font
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/src/fpdfapi/fpdf_font
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/src/fpdfapi/fpdf_font')
-rw-r--r--core/src/fpdfapi/fpdf_font/ttgsubtable.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
index 6c1b4263b1..1ee25995c2 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../../third_party/base/nonstd_unique_ptr.h"
-#include "../../../include/fxge/fx_ge.h"
#include "../../../include/fxge/fx_freetype.h"
+#include "../../../include/fxge/fx_ge.h"
+#include "third_party/base/nonstd_unique_ptr.h"
#include "ttgsubtable.h"
CFX_GlyphMap::CFX_GlyphMap() {}