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>

2 files changed, 20 insertions, 20 deletions

diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
index 9028642b76..5912d26a99 100644
--- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
@@ -3488,17 +3488,17 @@ CFX_WideString CXFA_FM2JSContext::EncodeURL(const CFX_ByteString& szURLString) {
       int32_t iIndex = 0;
       if (iLen % 2 != 0) {
         strEncode[1] = '0';
-        strEncode[2] = strTmp.GetAt(iLen - 1);
+        strEncode[2] = strTmp[iLen - 1];
         iIndex = iLen - 2;
       } else {
-        strEncode[1] = strTmp.GetAt(iLen - 1);
-        strEncode[2] = strTmp.GetAt(iLen - 2);
+        strEncode[1] = strTmp[iLen - 1];
+        strEncode[2] = strTmp[iLen - 2];
         iIndex = iLen - 3;
       }
       wsResultBuf << strEncode;
       while (iIndex > 0) {
-        strEncode[1] = strTmp.GetAt(iIndex);
-        strEncode[2] = strTmp.GetAt(iIndex - 1);
+        strEncode[1] = strTmp[iIndex];
+        strEncode[2] = strTmp[iIndex - 1];
         iIndex -= 2;
         wsResultBuf << strEncode;
       }
@@ -3994,8 +3994,8 @@ void CXFA_FM2JSContext::Replace(CFXJSE_Value* pThis,
   std::ostringstream resultString;
   int32_t iFindIndex = 0;
   for (int32_t u = 0; u < oneString.GetLength(); ++u) {
-    char ch = static_cast<char>(oneString.GetAt(u));
-    if (ch != static_cast<char>(twoString.GetAt(iFindIndex))) {
+    char ch = static_cast<char>(oneString[u]);
+    if (ch != static_cast<char>(twoString[iFindIndex])) {
       resultString << ch;
       continue;
     }
@@ -4003,8 +4003,8 @@ void CXFA_FM2JSContext::Replace(CFXJSE_Value* pThis,
     int32_t iTemp = u + 1;
     ++iFindIndex;
     while (iFindIndex < iFindLen) {
-      uint8_t chTemp = oneString.GetAt(iTemp);
-      if (chTemp != twoString.GetAt(iFindIndex)) {
+      uint8_t chTemp = oneString[iTemp];
+      if (chTemp != twoString[iFindIndex]) {
         iFindIndex = 0;
         break;
       }
@@ -4246,13 +4246,13 @@ void CXFA_FM2JSContext::Stuff(CFXJSE_Value* pThis,
   std::ostringstream resultString;
   int32_t i = 0;
   while (i < iStart) {
-    resultString << static_cast<char>(sourceString.GetAt(i));
+    resultString << static_cast<char>(sourceString[i]);
     ++i;
   }
   resultString << insertString.AsStringC();
   i = iStart + iDelete;
   while (i < iLength) {
-    resultString << static_cast<char>(sourceString.GetAt(i));
+    resultString << static_cast<char>(sourceString[i]);
     ++i;
   }
   resultString << '\0';
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);