From a9fa50f723654c4e8b26909bb686eaa3721df155 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:45:32 -0800 Subject: Merge to XFA: Fix relative includes within core/ TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . (cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8) Review URL: https://codereview.chromium.org/1438573002 . --- core/src/fxcrt/extension.h | 4 ++-- core/src/fxcrt/fx_basic_array.cpp | 2 +- core/src/fxcrt/fx_basic_bstring.cpp | 2 +- core/src/fxcrt/fx_basic_bstring_unittest.cpp | 2 +- core/src/fxcrt/fx_basic_buffer.cpp | 3 ++- core/src/fxcrt/fx_basic_coords.cpp | 4 ++-- core/src/fxcrt/fx_basic_gcc.cpp | 4 ++-- core/src/fxcrt/fx_basic_list.cpp | 3 ++- core/src/fxcrt/fx_basic_maps.cpp | 2 +- core/src/fxcrt/fx_basic_memmgr.cpp | 3 ++- core/src/fxcrt/fx_basic_memmgr_unittest.cpp | 2 +- core/src/fxcrt/fx_basic_plex.cpp | 2 +- core/src/fxcrt/fx_basic_utf.cpp | 3 ++- core/src/fxcrt/fx_basic_util.cpp | 4 +++- core/src/fxcrt/fx_basic_wstring.cpp | 2 +- core/src/fxcrt/fx_basic_wstring_unittest.cpp | 4 ++-- core/src/fxcrt/fx_bidi.cpp | 4 ++-- core/src/fxcrt/fx_bidi_unittest.cpp | 2 +- core/src/fxcrt/fx_extension.cpp | 5 +++-- core/src/fxcrt/fx_system_unittest.cpp | 4 ++-- core/src/fxcrt/fx_ucddata.cpp | 4 ++-- core/src/fxcrt/fx_unicode.cpp | 2 +- core/src/fxcrt/fx_xml_composer.cpp | 4 +++- core/src/fxcrt/fx_xml_parser.cpp | 4 +++- core/src/fxcrt/fxcrt_platforms.cpp | 3 ++- core/src/fxcrt/fxcrt_posix.cpp | 3 ++- core/src/fxcrt/fxcrt_windows.cpp | 3 ++- core/src/fxcrt/plex.h | 3 ++- core/src/fxcrt/xml_int.h | 5 ++++- 29 files changed, 55 insertions(+), 37 deletions(-) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h index 9960c03349..038fa30e70 100644 --- a/core/src/fxcrt/extension.h +++ b/core/src/fxcrt/extension.h @@ -7,8 +7,8 @@ #ifndef CORE_SRC_FXCRT_EXTENSION_H_ #define CORE_SRC_FXCRT_EXTENSION_H_ -#include "../../include/fxcrt/fx_basic.h" -#include "../../include/fxcrt/fx_safe_types.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_safe_types.h" class IFXCRT_FileAccess { public: diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index a24b78a0af..ccb80eba23 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "third_party/base/numerics/safe_math.h" CFX_BasicArray::CFX_BasicArray(int unit_size) diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 7793a0e19f..9d64fbe139 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -6,7 +6,7 @@ #include // For offsetof(). -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "third_party/base/numerics/safe_math.h" static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) { diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp index d8d880f8b1..f56e89f664 100644 --- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "../../../testing/fx_string_testhelpers.h" -#include "../../include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_string.h" #include "testing/gtest/include/gtest/gtest.h" TEST(fxcrt, ByteStringOperatorSubscript) { diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/src/fxcrt/fx_basic_buffer.cpp index 19ebfdff42..f606f1d368 100644 --- a/core/src/fxcrt/fx_basic_buffer.cpp +++ b/core/src/fxcrt/fx_basic_buffer.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" + FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf); CFX_BinaryBuf::CFX_BinaryBuf() : m_AllocStep(0), m_pBuffer(NULL), m_DataSize(0), m_AllocSize(0) {} diff --git a/core/src/fxcrt/fx_basic_coords.cpp b/core/src/fxcrt/fx_basic_coords.cpp index 4b570c6436..814fa36347 100644 --- a/core/src/fxcrt/fx_basic_coords.cpp +++ b/core/src/fxcrt/fx_basic_coords.cpp @@ -6,8 +6,8 @@ #include -#include "../../include/fxcrt/fx_coordinates.h" -#include "../../include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_ext.h" void FX_RECT::Normalize() { if (left > right) { diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp index 6f17482156..f8b0c7ac78 100644 --- a/core/src/fxcrt/fx_basic_gcc.cpp +++ b/core/src/fxcrt/fx_basic_gcc.cpp @@ -6,8 +6,8 @@ #include -#include "../../include/fxcrt/fx_ext.h" -#include "../../include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_string.h" template T FXSYS_StrToInt(STR_T str) { diff --git a/core/src/fxcrt/fx_basic_list.cpp b/core/src/fxcrt/fx_basic_list.cpp index 068aef2688..de5d9f3269 100644 --- a/core/src/fxcrt/fx_basic_list.cpp +++ b/core/src/fxcrt/fx_basic_list.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "plex.h" + CFX_PtrList::CFX_PtrList(int nBlockSize) : m_pNodeHead(NULL), m_pNodeTail(NULL), diff --git a/core/src/fxcrt/fx_basic_maps.cpp b/core/src/fxcrt/fx_basic_maps.cpp index 380beb6f89..aadeb15cb4 100644 --- a/core/src/fxcrt/fx_basic_maps.cpp +++ b/core/src/fxcrt/fx_basic_maps.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "plex.h" CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize) diff --git a/core/src/fxcrt/fx_basic_memmgr.cpp b/core/src/fxcrt/fx_basic_memmgr.cpp index ebc25851f6..6665df60da 100644 --- a/core/src/fxcrt/fx_basic_memmgr.cpp +++ b/core/src/fxcrt/fx_basic_memmgr.cpp @@ -5,7 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include // For abort(). -#include "../../include/fxcrt/fx_memory.h" + +#include "core/include/fxcrt/fx_memory.h" void* FXMEM_DefaultAlloc(size_t byte_size, int flags) { return (void*)malloc(byte_size); diff --git a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp b/core/src/fxcrt/fx_basic_memmgr_unittest.cpp index 819cbb4d08..9821ca9057 100644 --- a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp +++ b/core/src/fxcrt/fx_basic_memmgr_unittest.cpp @@ -4,8 +4,8 @@ #include +#include "core/include/fxcrt/fx_memory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../include/fxcrt/fx_memory.h" namespace { diff --git a/core/src/fxcrt/fx_basic_plex.cpp b/core/src/fxcrt/fx_basic_plex.cpp index b01ad8a274..b6383ecf20 100644 --- a/core/src/fxcrt/fx_basic_plex.cpp +++ b/core/src/fxcrt/fx_basic_plex.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_memory.h" #include "plex.h" CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead, diff --git a/core/src/fxcrt/fx_basic_utf.cpp b/core/src/fxcrt/fx_basic_utf.cpp index a9ad82f4b7..749e1226d3 100644 --- a/core/src/fxcrt/fx_basic_utf.cpp +++ b/core/src/fxcrt/fx_basic_utf.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" + void CFX_UTF8Decoder::Clear() { m_Buffer.Clear(); m_PendingBytes = 0; diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp index 46a0dec1e5..3e9d6169cd 100644 --- a/core/src/fxcrt/fx_basic_util.cpp +++ b/core/src/fxcrt/fx_basic_util.cpp @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" + #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ #include #include #else #include #endif + CFX_PrivateData::~CFX_PrivateData() { ClearAll(); } diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 0da9f5168d..131672da2b 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -6,7 +6,7 @@ #include // For offsetof(). -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "third_party/base/numerics/safe_math.h" // static diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp index 5141cdd61f..511d8f20c7 100644 --- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" #include "../../../testing/fx_string_testhelpers.h" -#include "../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" +#include "testing/gtest/include/gtest/gtest.h" TEST(fxcrt, WideStringOperatorSubscript) { // CFX_WideString includes the NUL terminator for non-empty strings. diff --git a/core/src/fxcrt/fx_bidi.cpp b/core/src/fxcrt/fx_bidi.cpp index 0310fa0e94..d5d87a345b 100644 --- a/core/src/fxcrt/fx_bidi.cpp +++ b/core/src/fxcrt/fx_bidi.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_bidi.h" -#include "../../include/fxcrt/fx_ucd.h" +#include "core/include/fxcrt/fx_bidi.h" +#include "core/include/fxcrt/fx_ucd.h" CFX_BidiChar::CFX_BidiChar() : m_iCurStart(0), diff --git a/core/src/fxcrt/fx_bidi_unittest.cpp b/core/src/fxcrt/fx_bidi_unittest.cpp index c629cbbdc6..8b5b6df108 100644 --- a/core/src/fxcrt/fx_bidi_unittest.cpp +++ b/core/src/fxcrt/fx_bidi_unittest.cpp @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/include/fxcrt/fx_bidi.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../include/fxcrt/fx_bidi.h" namespace { diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 402f86cecb..dd80b2284a 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" -#include "../../include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_ext.h" #include "extension.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #include #else diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/src/fxcrt/fx_system_unittest.cpp index 824ed5370c..aba20e07f0 100644 --- a/core/src/fxcrt/fx_system_unittest.cpp +++ b/core/src/fxcrt/fx_system_unittest.cpp @@ -4,9 +4,9 @@ #include -#include "testing/gtest/include/gtest/gtest.h" #include "../../../testing/fx_string_testhelpers.h" -#include "../../include/fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_system.h" +#include "testing/gtest/include/gtest/gtest.h" // Unit test covering cases where PDFium replaces well-known library // functionality on any given platformn. diff --git a/core/src/fxcrt/fx_ucddata.cpp b/core/src/fxcrt/fx_ucddata.cpp index 13c5da1419..c373d6e9d6 100644 --- a/core/src/fxcrt/fx_ucddata.cpp +++ b/core/src/fxcrt/fx_ucddata.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" -#include "../../include/fxcrt/fx_ucd.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_ucd.h" const FX_DWORD kTextLayoutCodeProperties[] = { 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, diff --git a/core/src/fxcrt/fx_unicode.cpp b/core/src/fxcrt/fx_unicode.cpp index 105301e0a8..2e86aec64c 100644 --- a/core/src/fxcrt/fx_unicode.cpp +++ b/core/src/fxcrt/fx_unicode.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_ucd.h" +#include "core/include/fxcrt/fx_ucd.h" FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) { size_t idx = static_cast(wch); diff --git a/core/src/fxcrt/fx_xml_composer.cpp b/core/src/fxcrt/fx_xml_composer.cpp index ed233ff784..5e0b304efe 100644 --- a/core/src/fxcrt/fx_xml_composer.cpp +++ b/core/src/fxcrt/fx_xml_composer.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_xml.h" #include "xml_int.h" + +#include "core/include/fxcrt/fx_xml.h" + void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, CFX_ByteStringC& bsSpace, CFX_ByteStringC& bsName) { diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp index dc59ded2b7..429bc38289 100644 --- a/core/src/fxcrt/fx_xml_parser.cpp +++ b/core/src/fxcrt/fx_xml_parser.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_xml.h" #include "xml_int.h" + +#include "core/include/fxcrt/fx_xml.h" + CXML_Parser::~CXML_Parser() { if (m_bOwnedStream) { m_pDataAcc->Release(); diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/src/fxcrt/fxcrt_platforms.cpp index a9f22d00c6..849e3a8500 100644 --- a/core/src/fxcrt/fxcrt_platforms.cpp +++ b/core/src/fxcrt/fxcrt_platforms.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" #include "fxcrt_platforms.h" +#include "core/include/fxcrt/fx_basic.h" + #if (_FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ && \ _FXM_PLATFORM_ != _FXM_PLATFORM_LINUX_ && \ _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ && \ diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/src/fxcrt/fxcrt_posix.cpp index 88e3d8af1d..d7df15eb32 100644 --- a/core/src/fxcrt/fxcrt_posix.cpp +++ b/core/src/fxcrt/fxcrt_posix.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_basic.h" #include "fxcrt_posix.h" +#include "core/include/fxcrt/fx_basic.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \ _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \ _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp index 86077019af..aff6a58aea 100644 --- a/core/src/fxcrt/fxcrt_windows.cpp +++ b/core/src/fxcrt/fxcrt_windows.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_string.h" #include "fxcrt_windows.h" +#include "core/include/fxcrt/fx_string.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ FX_BOOL FX_File_Exist(const CFX_ByteStringC& fileName) { FX_DWORD dwAttri = ::GetFileAttributesA(fileName.GetCStr()); diff --git a/core/src/fxcrt/plex.h b/core/src/fxcrt/plex.h index d560406539..12b7bd45a1 100644 --- a/core/src/fxcrt/plex.h +++ b/core/src/fxcrt/plex.h @@ -3,10 +3,11 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + #ifndef CORE_SRC_FXCRT_PLEX_H_ #define CORE_SRC_FXCRT_PLEX_H_ -#include "../../include/fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_system.h" struct CFX_Plex { CFX_Plex* pNext; diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h index ccd5bfdb7d..39c288afa8 100644 --- a/core/src/fxcrt/xml_int.h +++ b/core/src/fxcrt/xml_int.h @@ -7,7 +7,10 @@ #ifndef CORE_SRC_FXCRT_XML_INT_H_ #define CORE_SRC_FXCRT_XML_INT_H_ -#include "../../include/fxcrt/fx_stream.h" +#include "core/include/fxcrt/fx_stream.h" + +class CFX_UTF8Decoder; +class CXML_Element; class CXML_DataBufAcc : public IFX_BufferRead { public: -- cgit v1.2.3