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 /samples | |
| 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 'samples')
| -rw-r--r-- | samples/image_diff.cc | 4 | ||||
| -rw-r--r-- | samples/image_diff_png.cc | 6 | ||||
| -rw-r--r-- | samples/pdfium_test.cc | 2 | ||||
| -rw-r--r-- | samples/samples.gyp | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/samples/image_diff.cc b/samples/image_diff.cc index f10bd31085..88a3956d09 100644 --- a/samples/image_diff.cc +++ b/samples/image_diff.cc @@ -19,9 +19,9 @@ #include <string> #include <vector> -#include "../third_party/base/logging.h" -#include "../third_party/base/numerics/safe_conversions.h" #include "image_diff_png.h" +#include "third_party/base/logging.h" +#include "third_party/base/numerics/safe_conversions.h" #if defined(OS_WIN) #include <windows.h> diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc index a8ca925a3a..992617d5e5 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -16,9 +16,9 @@ #include <string> -#include "../third_party/base/logging.h" -#include "../third_party/lpng_v163/png.h" -#include "../third_party/zlib_v128/zlib.h" +#include "third_party/base/logging.h" +#include "third_party/lpng_v163/png.h" +#include "third_party/zlib_v128/zlib.h" namespace image_diff_png { diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 4ccf1a7721..190286a34e 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -25,7 +25,7 @@ #ifdef PDF_ENABLE_V8 #include "v8/include/libplatform/libplatform.h" #include "v8/include/v8.h" -#endif +#endif // PDF_ENABLE_V8 #ifdef _WIN32 #define snprintf _snprintf diff --git a/samples/samples.gyp b/samples/samples.gyp index 97181ba208..ff7b05823c 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -15,6 +15,7 @@ 'include_dirs': [ # This is implicit in GN. '<(DEPTH)', + '..', ], 'conditions': [ ['pdf_enable_v8==1', { |