From bde53d25de8cba5657aa7f63a301288663fa58e5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 12 Nov 2015 22:21:30 -0800 Subject: Merge to XFA: Remove relative includes. That refer to parent directories. TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1434223002 . (cherry picked from commit 22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228) Review URL: https://codereview.chromium.org/1439223003 . --- core/src/fxcodec/codec/codec_int.h | 2 +- core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 43d9f4cabc..eeaac886dd 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -11,8 +11,8 @@ #include #include -#include "../jbig2/JBig2_Context.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/jbig2/JBig2_Context.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp index 8c4a5b2705..fe552d2ed1 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -7,8 +7,8 @@ #include #include "codec_int.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../../testing/fx_string_testhelpers.h" static const OPJ_OFF_T kSkipError = static_cast(-1); static const OPJ_SIZE_T kReadError = static_cast(-1); -- cgit v1.2.3