From 3522876d5291922ddc62bf1b70d02743b0850673 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 8 Jul 2014 15:30:46 -0700 Subject: Remove custom memory manager BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003 --- core/src/fxcrt/fx_basic_bstring.cpp | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'core/src/fxcrt/fx_basic_bstring.cpp') diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 435f5a5e5c..f14ff2ba5d 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -1,7 +1,7 @@ // Copyright 2014 PDFium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" @@ -1176,35 +1176,3 @@ void CFX_StringBufBase::Append(int i, FX_DWORD flags) int len = _Buffer_itoa(buf, i, flags); Append(CFX_ByteStringC(buf, len)); } -void CFX_ByteStringL::Empty(IFX_Allocator* pAllocator) -{ - if (m_Ptr) { - FX_Allocator_Free(pAllocator, (FX_LPVOID)m_Ptr); - } - m_Ptr = NULL, m_Length = 0; -} -FX_LPSTR CFX_ByteStringL::AllocBuffer(FX_STRSIZE length, IFX_Allocator* pAllocator) -{ - Empty(pAllocator); - FX_LPSTR str = FX_Allocator_Alloc(pAllocator, FX_CHAR, length + 1); - if (!str) { - return NULL; - } - *(FX_LPSTR*)(&m_Ptr) = str; - m_Length = length; - return str; -} -void CFX_ByteStringL::Set(FX_BSTR src, IFX_Allocator* pAllocator) -{ - Empty(pAllocator); - if (src.GetCStr() != NULL && src.GetLength() > 0) { - FX_LPSTR str = FX_Allocator_Alloc(pAllocator, FX_CHAR, src.GetLength() + 1); - if (!str) { - return; - } - FXSYS_memcpy32(str, src, src.GetLength()); - str[src.GetLength()] = '\0'; - *(FX_LPSTR*)(&m_Ptr) = str; - m_Length = src.GetLength(); - } -} -- cgit v1.2.3