Make CFX_WideString::LockBuffer() completely unused.
authorTom Sepez <tsepez@chromium.org>
Tue, 28 Apr 2015 19:25:39 +0000 (12:25 -0700)
committerTom Sepez <tsepez@chromium.org>
Tue, 28 Apr 2015 19:25:39 +0000 (12:25 -0700)
Then remove CFX_{Wide,Byte}String::LockBuffer().  Prelude to a vast
simplification. There's an additional copy now in one place, so
shoot me.

BUG=pdfium:144
R=thestig@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/ee7412f5aef353e5c6f1a64d0e1708ed926869d9

Review URL: https://codereview.chromium.org/1053613004

core/include/fxcrt/fx_string.h
core/src/fpdfdoc/doc_bookmark.cpp
core/src/fxcrt/fx_basic_bstring.cpp
core/src/fxcrt/fx_basic_wstring.cpp

index 1efb814..a7cf2e1 100644 (file)
@@ -320,8 +320,6 @@ public:
 
     FX_LPSTR                           GetBuffer(FX_STRSIZE len);
 
-    FX_LPSTR                           LockBuffer();
-
     void                                       ReleaseBuffer(FX_STRSIZE len = -1);
 
     CFX_ByteString                     Mid(FX_STRSIZE first) const;
@@ -730,8 +728,6 @@ public:
 
     FX_LPWSTR                          GetBuffer(FX_STRSIZE len);
 
-    FX_LPWSTR                          LockBuffer();
-
     void                                       ReleaseBuffer(FX_STRSIZE len = -1);
 
     int                                                GetInteger() const;
index 9814de6..6ba98e6 100644 (file)
@@ -4,7 +4,11 @@
  
 // 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) {
@@ -55,15 +59,18 @@ 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++) {
-        if (buf[i] < 0x20) {
-            buf[i] = 0x20;
-        }
+        FX_WCHAR w = title[i];
+        buf[i] = w > 0x20 ? w : 0x20;
     }
-    title.ReleaseBuffer(len);
-    return title;
+    return CFX_WideString(buf, len);
 }
 CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const
 {
index cda7d1f..961aebe 100644 (file)
@@ -341,15 +341,6 @@ 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);
index e255aa0..2ea23e4 100644 (file)
@@ -535,15 +535,6 @@ 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) {