From dabc5d57bf473708295800a7991bc1fafdf76288 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 5 Feb 2015 09:46:23 -0800 Subject: Add namespace and-re-arrange PDFium's local copy of chromium /base. Any projects DEPS'd into chromium and requiring a /base subset should have a local copy of that subset in a separate namespace. This will avoid future naming conflicts. Re-arrange the directory structure to better identify what came from chromium's base, and to make drop-in replacement easier for files that contain hard-coded "base/" in their #include directives. R=jam@chromium.org Review URL: https://codereview.chromium.org/900753002 --- core/src/fxcrt/fx_basic_array.cpp | 8 ++++---- core/src/fxcrt/fx_basic_bstring.cpp | 4 ++-- core/src/fxcrt/fx_basic_wstring.cpp | 6 +++--- core/src/fxcrt/fx_safe_types.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index 0694cf9cbd..9bdc607bfe 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/numerics/safe_math.h" +#include "../../../third_party/base/numerics/safe_math.h" CFX_BasicArray::CFX_BasicArray(int unit_size) : m_pData(NULL) @@ -32,7 +32,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) } if (m_pData == NULL) { - base::CheckedNumeric totalSize = nNewSize; + pdfium::base::CheckedNumeric totalSize = nNewSize; totalSize *= m_nUnitSize; if (!totalSize.IsValid()) { m_nSize = m_nMaxSize = 0; @@ -51,7 +51,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) m_nSize = nNewSize; } else { int nNewMax = nNewSize < m_nMaxSize ? m_nMaxSize : nNewSize; - base::CheckedNumeric totalSize = nNewMax; + pdfium::base::CheckedNumeric totalSize = nNewMax; totalSize *= m_nUnitSize; if (!totalSize.IsValid() || nNewMax < m_nSize) { return FALSE; @@ -70,7 +70,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) FX_BOOL CFX_BasicArray::Append(const CFX_BasicArray& src) { int nOldSize = m_nSize; - base::CheckedNumeric newSize = m_nSize; + pdfium::base::CheckedNumeric newSize = m_nSize; newSize += src.m_nSize; if (m_nUnitSize != src.m_nUnitSize || !newSize.IsValid() || !SetSize(newSize.ValueOrDie())) { return FALSE; diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 0d4f860b32..39104e29f6 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/numerics/safe_math.h" +#include "../../../third_party/base/numerics/safe_math.h" static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) { @@ -52,7 +52,7 @@ static CFX_StringData* FX_AllocString(int nLen) if (nLen == 0 || nLen < 0) { return NULL; } - base::CheckedNumeric nSize = nLen; + pdfium::base::CheckedNumeric nSize = nLen; nSize += sizeof(long) * 3 + 1; CFX_StringData* pData = (CFX_StringData*)FX_Alloc(FX_BYTE, nSize.ValueOrDie()); if (!pData) { diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 0945d2f1c5..dfdbef8bd6 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/numerics/safe_math.h" +#include "../../../third_party/base/numerics/safe_math.h" static CFX_StringDataW* FX_AllocStringW(int nLen) { @@ -13,7 +13,7 @@ static CFX_StringDataW* FX_AllocStringW(int nLen) return NULL; } - base::CheckedNumeric iSize = static_cast(sizeof(FX_WCHAR)); + pdfium::base::CheckedNumeric iSize = static_cast(sizeof(FX_WCHAR)); iSize *= nLen + 1; iSize += sizeof(long) * 3; CFX_StringDataW* pData = (CFX_StringDataW*)FX_Alloc(FX_BYTE, iSize.ValueOrDie()); @@ -435,7 +435,7 @@ void CFX_WideString::AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STR if (nCopyLen == 0 || nCopyLen < 0) { return; } - base::CheckedNumeric iSize = static_cast(sizeof(FX_WCHAR)); + pdfium::base::CheckedNumeric iSize = static_cast(sizeof(FX_WCHAR)); iSize *= nCopyLen; ASSERT(dest.m_pData == NULL); dest.m_pData = FX_AllocStringW(nCopyLen); diff --git a/core/src/fxcrt/fx_safe_types.h b/core/src/fxcrt/fx_safe_types.h index 794e1f19dc..5772fd0e3c 100644 --- a/core/src/fxcrt/fx_safe_types.h +++ b/core/src/fxcrt/fx_safe_types.h @@ -7,11 +7,11 @@ #include // For size_t. -#include "../../../third_party/numerics/safe_math.h" +#include "../../../third_party/base/numerics/safe_math.h" -typedef base::CheckedNumeric FX_SAFE_DWORD; -typedef base::CheckedNumeric FX_SAFE_INT32; -typedef base::CheckedNumeric FX_SAFE_SIZE_T; -typedef base::CheckedNumeric FX_SAFE_FILESIZE; +typedef pdfium::base::CheckedNumeric FX_SAFE_DWORD; +typedef pdfium::base::CheckedNumeric FX_SAFE_INT32; +typedef pdfium::base::CheckedNumeric FX_SAFE_SIZE_T; +typedef pdfium::base::CheckedNumeric FX_SAFE_FILESIZE; #endif // FX_SAFE_TYPES_H_ -- cgit v1.2.3