From 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 Mon Sep 17 00:00:00 2001
From: Ryan Harrison <rharrison@chromium.org>
Date: Tue, 15 Aug 2017 10:37:59 -0400
Subject: 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>
---
 xfa/fxfa/fm2js/cxfa_fmexpression.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'xfa/fxfa/fm2js/cxfa_fmexpression.cpp')

diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
index c6b5814d6d..e323a330dc 100644
--- a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
@@ -72,7 +72,7 @@ bool CXFA_FMFunctionDefinition::ToJavaScript(CFX_WideTextBuf& javascript) {
   for (const auto& identifier : m_pArguments) {
     if (bNeedComma)
       javascript << L", ";
-    if (identifier.GetAt(0) == L'!') {
+    if (identifier[0] == L'!') {
       CFX_WideString tempIdentifier =
           EXCLAMATION_IN_IDENTIFIER +
           identifier.Right(identifier.GetLength() - 1);
@@ -128,7 +128,7 @@ CXFA_FMVarExpression::~CXFA_FMVarExpression() {}
 bool CXFA_FMVarExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << L"var ";
   CFX_WideString tempName(m_wsName);
-  if (m_wsName.GetAt(0) == L'!') {
+  if (m_wsName[0] == L'!') {
     tempName =
         EXCLAMATION_IN_IDENTIFIER + m_wsName.Right(m_wsName.GetLength() - 1);
   }
@@ -152,7 +152,7 @@ bool CXFA_FMVarExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 bool CXFA_FMVarExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << L"var ";
   CFX_WideString tempName(m_wsName);
-  if (m_wsName.GetAt(0) == L'!') {
+  if (m_wsName[0] == L'!') {
     tempName =
         EXCLAMATION_IN_IDENTIFIER + m_wsName.Right(m_wsName.GetLength() - 1);
   }
@@ -459,7 +459,7 @@ CXFA_FMForExpression::~CXFA_FMForExpression() {}
 bool CXFA_FMForExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << L"{\nvar ";
   CFX_WideString tempVariant;
-  if (m_wsVariant.GetAt(0) == L'!') {
+  if (m_wsVariant[0] == L'!') {
     tempVariant = EXCLAMATION_IN_IDENTIFIER +
                   m_wsVariant.Right(m_wsVariant.GetLength() - 1);
     javascript << tempVariant;
@@ -514,7 +514,7 @@ bool CXFA_FMForExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << L" = 0;\n";
   javascript << L"{\nvar ";
   CFX_WideString tempVariant;
-  if (m_wsVariant.GetAt(0) == L'!') {
+  if (m_wsVariant[0] == L'!') {
     tempVariant = EXCLAMATION_IN_IDENTIFIER +
                   m_wsVariant.Right(m_wsVariant.GetLength() - 1);
     javascript << tempVariant;
@@ -580,7 +580,7 @@ CXFA_FMForeachExpression::~CXFA_FMForeachExpression() {}
 bool CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << L"{\n";
   javascript << L"var ";
-  if (m_wsIdentifier.GetAt(0) == L'!') {
+  if (m_wsIdentifier[0] == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER +
         m_wsIdentifier.Right(m_wsIdentifier.GetLength() - 1);
@@ -612,7 +612,7 @@ bool CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << L" < ";
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << L".length)\n{\n";
-  if (m_wsIdentifier.GetAt(0) == L'!') {
+  if (m_wsIdentifier[0] == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER +
         m_wsIdentifier.Right(m_wsIdentifier.GetLength() - 1);
@@ -637,7 +637,7 @@ bool CXFA_FMForeachExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << L" = 0;\n";
   javascript << L"{\n";
   javascript << L"var ";
-  if (m_wsIdentifier.GetAt(0) == L'!') {
+  if (m_wsIdentifier[0] == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER +
         m_wsIdentifier.Right(m_wsIdentifier.GetLength() - 1);
@@ -668,7 +668,7 @@ bool CXFA_FMForeachExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << L" < ";
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << L".length)\n{\n";
-  if (m_wsIdentifier.GetAt(0) == L'!') {
+  if (m_wsIdentifier[0] == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER +
         m_wsIdentifier.Right(m_wsIdentifier.GetLength() - 1);
-- 
cgit v1.2.3