diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-28 12:33:56 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-28 12:33:56 -0700 |
| commit | 0334cb31d20bc896ce649da55489e8e7348111f8 (patch) | |
| tree | 6f62b5280dd1755d8b52c775484b20cbe22fd7d5 /core/src/fpdfdoc | |
| parent | 5a256ad29483eb2b13e6e2c89fe0f77a9103f68f (diff) | |
| download | pdfium-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/src/fpdfdoc')
| -rw-r--r-- | core/src/fpdfdoc/doc_bookmark.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
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 { |