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 /xfa/fxfa/parser | |
| parent | ed1c58049f0c164969946b6ad0ff06d952ab1949 (diff) | |
| download | pdfium-chromium/3466.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 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document_parser.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_localevalue.cpp | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_nodehelper.cpp | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index 6f3e56ce4c..8bafc7f078 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -138,7 +138,7 @@ bool GetAttributeLocalName(const WideStringView& wsAttributeName, WideString wsAttrName(wsAttributeName); auto pos = wsAttrName.Find(L':', 0); if (!pos.has_value()) { - wsLocalAttrName = wsAttrName; + wsLocalAttrName = std::move(wsAttrName); return false; } wsLocalAttrName = wsAttrName.Right(wsAttrName.GetLength() - pos.value() - 1); @@ -254,7 +254,7 @@ void ConvertXMLToPlainText(CFX_XMLElement* pRootXMLNode, WideString& wsOutput) { if (IsStringAllWhitespace(wsText)) continue; - wsOutput = wsText; + wsOutput = std::move(wsText); break; } default: diff --git a/xfa/fxfa/parser/cxfa_localevalue.cpp b/xfa/fxfa/parser/cxfa_localevalue.cpp index 78f6b3b5e4..3a55045905 100644 --- a/xfa/fxfa/parser/cxfa_localevalue.cpp +++ b/xfa/fxfa/parser/cxfa_localevalue.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/cxfa_localevalue.h" +#include <utility> #include <vector> #include "core/fxcrt/fx_extension.h" @@ -618,7 +619,7 @@ bool CXFA_LocaleValue::ParsePatternValue(const WideString& wsValue, WideString fNum; bRet = pFormat->ParseNum(wsValue, wsFormat, &fNum); if (bRet) - m_wsValue = fNum; + m_wsValue = std::move(fNum); break; } case FX_LOCALECATEGORY_Text: diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index eea054a169..7eddddf37b 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/cxfa_nodehelper.h" +#include <utility> + #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/xfa/cjx_object.h" @@ -237,14 +239,13 @@ WideString CXFA_NodeHelper::GetNameExpression(CXFA_Node* refNode, WideString wsName; if (bIsAllPath) { wsName = GetNameExpression(refNode, false, eLogicType); - WideString wsParent; CXFA_Node* parent = ResolveNodes_GetParent(refNode, XFA_LOGIC_NoTransparent); while (parent) { - wsParent = GetNameExpression(parent, false, eLogicType); + WideString wsParent = GetNameExpression(parent, false, eLogicType); wsParent += L"."; wsParent += wsName; - wsName = wsParent; + wsName = std::move(wsParent); parent = ResolveNodes_GetParent(parent, XFA_LOGIC_NoTransparent); } return wsName; |