From 0334cb31d20bc896ce649da55489e8e7348111f8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Apr 2015 12:33:56 -0700 Subject: Revert "Make CFX_WideString::LockBuffer() completely unused." This reverts commit 5a256ad29483eb2b13e6e2c89fe0f77a9103f68f. Reason for revert: broke JS tests. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1112673002 --- core/src/fxcrt/fx_basic_bstring.cpp | 9 +++++++++ core/src/fxcrt/fx_basic_wstring.cpp | 9 +++++++++ 2 files changed, 18 insertions(+) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 961aebe69c..cda7d1fdd7 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -341,6 +341,15 @@ void CFX_ByteString::ReleaseBuffer(FX_STRSIZE nNewLength) m_pData->m_nDataLength = nNewLength; m_pData->m_String[nNewLength] = 0; } +FX_LPSTR CFX_ByteString::LockBuffer() +{ + if (m_pData == NULL) { + return NULL; + } + FX_LPSTR lpsz = GetBuffer(0); + m_pData->m_nRefs = -1; + return lpsz; +} void CFX_ByteString::Reserve(FX_STRSIZE len) { GetBuffer(len); diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 2ea23e4f19..e255aa0779 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -535,6 +535,15 @@ int CFX_WideString::Compare(const CFX_WideString& str) const } return 0; } +FX_LPWSTR CFX_WideString::LockBuffer() +{ + if (m_pData == NULL) { + return NULL; + } + FX_LPWSTR lpsz = GetBuffer(0); + m_pData->m_nRefs = -1; + return lpsz; +} void CFX_WideString::SetAt(FX_STRSIZE nIndex, FX_WCHAR ch) { if (m_pData == NULL) { -- cgit v1.2.3