From ab27768d235985c0789a10ab490be43e262f48f6 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 17 Feb 2016 10:07:21 -0800
Subject: Banish CFX_ByteArray and CFX_WideArray to the XFA side.

Fix IWYU and include paths as we go.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1701883004 .
---
 core/src/fpdftext/fpdf_text_int.cpp | 20 +++++++++-----------
 core/src/fpdftext/text_int.h        |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'core/src/fpdftext')

diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index b6e39de004..aa13acee8a 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -1988,7 +1988,7 @@ FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat,
   } else {
     m_findPreStart = startPos;
   }
-  m_csFindWhatArray.RemoveAll();
+  m_csFindWhatArray.clear();
   int i = 0;
   while (i < len) {
     if (findwhatStr.GetAt(i) != ' ') {
@@ -1999,9 +1999,9 @@ FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat,
   if (i < len) {
     ExtractFindWhat(findwhatStr);
   } else {
-    m_csFindWhatArray.Add(findwhatStr);
+    m_csFindWhatArray.push_back(findwhatStr);
   }
-  if (m_csFindWhatArray.GetSize() <= 0) {
+  if (m_csFindWhatArray.empty()) {
     return FALSE;
   }
   m_IsFind = TRUE;
@@ -2027,7 +2027,7 @@ FX_BOOL CPDF_TextPageFind::FindNext() {
     m_IsFind = FALSE;
     return m_IsFind;
   }
-  int nCount = m_csFindWhatArray.GetSize();
+  int nCount = pdfium::CollectionSize<int>(m_csFindWhatArray);
   int nResultPos = 0;
   int nStartPos = 0;
   nStartPos = m_findNextStart;
@@ -2102,8 +2102,7 @@ FX_BOOL CPDF_TextPageFind::FindNext() {
       }
     }
   }
-  m_resEnd = nResultPos +
-             m_csFindWhatArray[m_csFindWhatArray.GetSize() - 1].GetLength() - 1;
+  m_resEnd = nResultPos + m_csFindWhatArray.back().GetLength() - 1;
   m_IsFind = TRUE;
   int resStart = GetCharIndex(m_resStart);
   int resEnd = GetCharIndex(m_resEnd);
@@ -2175,7 +2174,7 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat) {
         ExtractSubString(csWord, findwhat.c_str(), index, TEXT_BLANK_CHAR);
     if (csWord.IsEmpty()) {
       if (ret) {
-        m_csFindWhatArray.Add(CFX_WideString(L""));
+        m_csFindWhatArray.push_back(L"");
         index++;
         continue;
       } else {
@@ -2192,10 +2191,9 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat) {
           continue;
         }
         if (pos > 0) {
-          CFX_WideString preStr = csWord.Mid(0, pos);
-          m_csFindWhatArray.Add(preStr);
+          m_csFindWhatArray.push_back(csWord.Mid(0, pos));
         }
-        m_csFindWhatArray.Add(curStr);
+        m_csFindWhatArray.push_back(curStr);
         if (pos == csWord.GetLength() - 1) {
           csWord.Empty();
           break;
@@ -2207,7 +2205,7 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat) {
       pos++;
     }
     if (!csWord.IsEmpty()) {
-      m_csFindWhatArray.Add(csWord);
+      m_csFindWhatArray.push_back(csWord);
     }
     index++;
   }
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index edde651ddb..9b7d654930 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -186,7 +186,7 @@ class CPDF_TextPageFind : public IPDF_TextPageFind {
   CFX_WideString m_strText;
   CFX_WideString m_findWhat;
   int m_flags;
-  CFX_WideStringArray m_csFindWhatArray;
+  std::vector<CFX_WideString> m_csFindWhatArray;
   int m_findNextStart;
   int m_findPreStart;
   FX_BOOL m_bMatchCase;
-- 
cgit v1.2.3