diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-19 17:33:32 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-19 17:33:32 +0000 |
| commit | e005dc33c31a2e701e1af3a0a3e5775cabbf1ddd (patch) | |
| tree | 6cf7623219078464910ee438311e24121c8af2a0 /core/fpdfdoc | |
| parent | ed1c58049f0c164969946b6ad0ff06d952ab1949 (diff) | |
| download | pdfium-e005dc33c31a2e701e1af3a0a3e5775cabbf1ddd.tar.xz | |
Move fxcrt::{Byte,Wide}Strings with std::move().chromium/3466
Remove some string copies in barcode that were noticed whilst
looking for moves.
Change-Id: Ieda34d00f633576ba1f0dca283dcdabfb36f236c
Reviewed-on: https://pdfium-review.googlesource.com/35410
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_formcontrol.cpp | 3 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_formfield.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 7 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_structelement.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index 2100d4ecee..a80b0294c1 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -149,11 +149,10 @@ bool CPDF_FormControl::IsDefaultChecked() const { void CPDF_FormControl::CheckControl(bool bChecked) { ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton); - ByteString csOn = GetOnStateName(); ByteString csOldAS = m_pWidgetDict->GetStringFor("AS", "Off"); ByteString csAS = "Off"; if (bChecked) - csAS = csOn; + csAS = GetOnStateName(); if (csOldAS == csAS) return; m_pWidgetDict->SetNewFor<CPDF_Name>("AS", csAS); diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index 8dcc9e68b6..2f05ad8732 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -92,7 +92,7 @@ WideString FPDF_GetFullName(CPDF_Dictionary* pFieldDict) { WideString short_name = pLevel->GetUnicodeTextFor("T"); if (!short_name.IsEmpty()) { if (full_name.IsEmpty()) - full_name = short_name; + full_name = std::move(short_name); else full_name = short_name + L"." + full_name; } diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index de3770901b..b18310cfde 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -206,8 +206,7 @@ bool FindFont(CPDF_Dictionary* pFormDict, if (!pFont) continue; - ByteString csBaseFont; - csBaseFont = pFont->GetBaseFont(); + ByteString csBaseFont = pFont->GetBaseFont(); csBaseFont.Remove(' '); if (csBaseFont == csFontName) { *csNameTag = csKey; @@ -228,7 +227,7 @@ void AddFont(CPDF_Dictionary*& pFormDict, ByteString csTag; if (FindFont(pFormDict, pFont, &csTag)) { - *csNameTag = csTag; + *csNameTag = std::move(csTag); return; } if (!pFormDict) @@ -261,7 +260,7 @@ CPDF_Font* AddNativeFont(CPDF_Dictionary*& pFormDict, ByteString csTemp; CPDF_Font* pFont = GetNativeFont(pFormDict, pDocument, charSet, &csTemp); if (pFont) { - *csNameTag = csTemp; + *csNameTag = std::move(csTemp); return pFont; } ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet, nullptr); diff --git a/core/fpdfdoc/cpdf_structelement.cpp b/core/fpdfdoc/cpdf_structelement.cpp index 24c028fb61..d8fc0d88ba 100644 --- a/core/fpdfdoc/cpdf_structelement.cpp +++ b/core/fpdfdoc/cpdf_structelement.cpp @@ -6,6 +6,8 @@ #include "core/fpdfdoc/cpdf_structelement.h" +#include <utility> + #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_name.h" @@ -36,7 +38,7 @@ CPDF_StructElement::CPDF_StructElement(CPDF_StructTree* pTree, if (pTree->GetRoleMap()) { ByteString mapped = pTree->GetRoleMap()->GetStringFor(m_Type); if (!mapped.IsEmpty()) - m_Type = mapped; + m_Type = std::move(mapped); } LoadKids(pDict); } |