diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-15 10:37:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-15 15:03:10 +0000 |
| commit | 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 (patch) | |
| tree | 82cbafc46f574a05ae0c1d1d3d7f9ebde6cb932d /core/fpdfdoc/cpdf_variabletext.cpp | |
| parent | 171cb27a720036c48ae3a6176084e880742af0a9 (diff) | |
| download | pdfium-8a1758bf11c2d741e0cddc761b1dd2cdf564db93.tar.xz | |
Remove GetAt from string classes
This method duplicates the behaviour of the const [] operator and
doesn't offer any additional safety. Folding them into one
implementation.
SetAt is retained, since implementing the non-const [] operator to
replace SetAt has potential performance concerns. Specifically many
non-obvious cases of reading an element using [] will cause a realloc
& copy.
BUG=pdfium:860
Change-Id: I3ef5e5e5a15376f040256b646eb0d90636e24b67
Reviewed-on: https://pdfium-review.googlesource.com/10870
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_variabletext.cpp')
| -rw-r--r-- | core/fpdfdoc/cpdf_variabletext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp index 74a5e3adfc..877f8ca01e 100644 --- a/core/fpdfdoc/cpdf_variabletext.cpp +++ b/core/fpdfdoc/cpdf_variabletext.cpp @@ -358,11 +358,11 @@ CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place, CPVT_WordPlace wp = place; for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) { CPVT_WordPlace oldwp = wp; - uint16_t word = swText.GetAt(i); + uint16_t word = swText[i]; switch (word) { case 0x0D: if (m_bMultiLine) { - if (swText.GetAt(i + 1) == 0x0A) + if (swText[i + 1] == 0x0A) i += 1; wp = InsertSection(wp, nullptr, nullptr); @@ -370,7 +370,7 @@ CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place, break; case 0x0A: if (m_bMultiLine) { - if (swText.GetAt(i + 1) == 0x0D) + if (swText[i + 1] == 0x0D) i += 1; wp = InsertSection(wp, nullptr, nullptr); @@ -426,11 +426,11 @@ void CPDF_VariableText::SetText(const CFX_WideString& swText) { if (m_nCharArray > 0 && nCharCount >= m_nCharArray) break; - uint16_t word = swText.GetAt(i); + uint16_t word = swText[i]; switch (word) { case 0x0D: if (m_bMultiLine) { - if (i + 1 < sz && swText.GetAt(i + 1) == 0x0A) + if (i + 1 < sz && swText[i + 1] == 0x0A) i++; wp.AdvanceSection(); AddSection(wp, secinfo); @@ -438,7 +438,7 @@ void CPDF_VariableText::SetText(const CFX_WideString& swText) { break; case 0x0A: if (m_bMultiLine) { - if (i + 1 < sz && swText.GetAt(i + 1) == 0x0D) + if (i + 1 < sz && swText[i + 1] == 0x0D) i++; wp.AdvanceSection(); AddSection(wp, secinfo); |