summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-28 12:33:56 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-28 12:33:56 -0700
commit0334cb31d20bc896ce649da55489e8e7348111f8 (patch)
tree6f62b5280dd1755d8b52c775484b20cbe22fd7d5 /core
parent5a256ad29483eb2b13e6e2c89fe0f77a9103f68f (diff)
downloadpdfium-0334cb31d20bc896ce649da55489e8e7348111f8.tar.xz
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
Diffstat (limited to 'core')
-rw-r--r--core/include/fxcrt/fx_string.h4
-rw-r--r--core/src/fpdfdoc/doc_bookmark.cpp19
-rw-r--r--core/src/fxcrt/fx_basic_bstring.cpp9
-rw-r--r--core/src/fxcrt/fx_basic_wstring.cpp9
4 files changed, 28 insertions, 13 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index a7cf2e1c16..1efb814b08 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -320,6 +320,8 @@ public:
FX_LPSTR GetBuffer(FX_STRSIZE len);
+ FX_LPSTR LockBuffer();
+
void ReleaseBuffer(FX_STRSIZE len = -1);
CFX_ByteString Mid(FX_STRSIZE first) const;
@@ -728,6 +730,8 @@ public:
FX_LPWSTR GetBuffer(FX_STRSIZE len);
+ FX_LPWSTR LockBuffer();
+
void ReleaseBuffer(FX_STRSIZE len = -1);
int GetInteger() const;
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp
index 6ba98e655d..9814de61bf 100644
--- a/core/src/fpdfdoc/doc_bookmark.cpp
+++ b/core/src/fpdfdoc/doc_bookmark.cpp
@@ -4,11 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include <vector>
-
-#include "../../../third_party/base/nonstd_unique_ptr.h"
#include "../../include/fpdfdoc/fpdf_doc.h"
-
CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild(const CPDF_Bookmark& parent) const
{
if (!parent.m_pDict) {
@@ -59,18 +55,15 @@ CFX_WideString CPDF_Bookmark::GetTitle() const
return CFX_WideString();
}
CFX_WideString title = pString->GetUnicodeText();
+ FX_LPWSTR buf = title.LockBuffer();
int len = title.GetLength();
- if (!len) {
- return CFX_WideString();
- }
- nonstd::unique_ptr<std::vector<FX_WCHAR> > vec;
- vec.reset(new std::vector<FX_WCHAR>(len));
- FX_WCHAR* buf = &vec->front();
for (int i = 0; i < len; i++) {
- FX_WCHAR w = title[i];
- buf[i] = w > 0x20 ? w : 0x20;
+ if (buf[i] < 0x20) {
+ buf[i] = 0x20;
+ }
}
- return CFX_WideString(buf, len);
+ title.ReleaseBuffer(len);
+ return title;
}
CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const
{
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) {