diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-11 21:11:28 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-11 21:11:28 +0000 |
| commit | 1e934f6868465bca960f9f13489489ba1d649581 (patch) | |
| tree | 36df9044ccd3327d3d60fb43ac523e2bc260cca6 /xfa/fxfa | |
| parent | 4796acb896dabefe6d9a2dbe6d8a61ff7e086dfd (diff) | |
| download | pdfium-1e934f6868465bca960f9f13489489ba1d649581.tar.xz | |
Remove use of GetBuffer()/ReleaseBuffer() when c_str() is sufficient.
Greatly simplify the code which was neither changing allocations nor
doing any actual work. Eventually GetBuffer() will return a span, and
this makes fewer places to change.
Comment AsFPDFWideString() as a place where we may want a redundant
copy, and make available outside the .cpp file.
Fix one "const" along the way.
Change-Id: I187758b69a0ba3501b3622f6c06280793cd5d464
Reviewed-on: https://pdfium-review.googlesource.com/30011
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/cxfa_linkuserdata.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_linkuserdata.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_textlayout.cpp | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_linkuserdata.cpp b/xfa/fxfa/cxfa_linkuserdata.cpp index c32b74664c..84cee352a7 100644 --- a/xfa/fxfa/cxfa_linkuserdata.cpp +++ b/xfa/fxfa/cxfa_linkuserdata.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/cxfa_linkuserdata.h" -CXFA_LinkUserData::CXFA_LinkUserData(wchar_t* pszText) +CXFA_LinkUserData::CXFA_LinkUserData(const wchar_t* pszText) : m_wsURLContent(pszText) {} CXFA_LinkUserData::~CXFA_LinkUserData() {} diff --git a/xfa/fxfa/cxfa_linkuserdata.h b/xfa/fxfa/cxfa_linkuserdata.h index 3d0f95e91c..f62bd3c044 100644 --- a/xfa/fxfa/cxfa_linkuserdata.h +++ b/xfa/fxfa/cxfa_linkuserdata.h @@ -19,7 +19,7 @@ class CXFA_LinkUserData : public Retainable { const wchar_t* GetLinkURL() const { return m_wsURLContent.c_str(); } private: - explicit CXFA_LinkUserData(wchar_t* pszText); + explicit CXFA_LinkUserData(const wchar_t* pszText); ~CXFA_LinkUserData() override; WideString m_wsURLContent; diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index 41d46f8824..e360c16dde 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -746,9 +746,8 @@ bool CXFA_TextLayout::LoadRichText( ASSERT(pElement); WideString wsLinkContent = pElement->GetString(L"href"); if (!wsLinkContent.IsEmpty()) { - pLinkData = pdfium::MakeRetain<CXFA_LinkUserData>( - wsLinkContent.GetBuffer(wsLinkContent.GetLength())); - wsLinkContent.ReleaseBuffer(wsLinkContent.GetLength()); + pLinkData = + pdfium::MakeRetain<CXFA_LinkUserData>(wsLinkContent.c_str()); } } |