Remove CFX_ArrayTemplate from CPDF_LinkExtract

core/fpdftext/fpdf_text_int.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <cctype>
 #include <cwctype>
 #include <memory>
@@ skipping 2312 matching lines @@
 int CPDF_TextPageFind::GetCurOrder() const {
   return GetCharIndex(m_resStart);
 }
 
 int CPDF_TextPageFind::GetMatchedCount() const {
   int resStart = GetCharIndex(m_resStart);
   int resEnd = GetCharIndex(m_resEnd);
   return resEnd - resStart + 1;
 }
 
-CPDF_LinkExtract::CPDF_LinkExtract()
-    : m_pTextPage(nullptr), m_bIsParsed(false) {}
+CPDF_LinkExtract::CPDF_LinkExtract(const CPDF_TextPage* pTextPage)
+    : m_pTextPage(pTextPage), m_bIsParsed(false) {}
 
 CPDF_LinkExtract::~CPDF_LinkExtract() {
-  DeleteLinkList();
 }
 
-FX_BOOL CPDF_LinkExtract::ExtractLinks(const CPDF_TextPage* pTextPage) {
-  if (!pTextPage || !pTextPage->IsParsed())
+FX_BOOL CPDF_LinkExtract::ExtractLinks() {
+  if (!m_pTextPage->IsParsed())
     return FALSE;
 
-  m_pTextPage = (const CPDF_TextPage*)pTextPage;
+  m_LinkList.clear();
   m_strPageText = m_pTextPage->GetPageText(0, -1);
-  DeleteLinkList();
-  if (m_strPageText.IsEmpty()) {
+  if (m_strPageText.IsEmpty())
     return FALSE;
-  }
+
   ParseLink();
   m_bIsParsed = true;
   return TRUE;
 }
 
-void CPDF_LinkExtract::DeleteLinkList() {
-  while (m_LinkList.GetSize()) {
-    CPDF_LinkExt* linkinfo = NULL;
-    linkinfo = m_LinkList.GetAt(0);
-    m_LinkList.RemoveAt(0);
-    delete linkinfo;
-  }
-  m_LinkList.RemoveAll();
-}
-
 int CPDF_LinkExtract::CountLinks() const {
-  if (!m_bIsParsed) {
-    return -1;
-  }
-  return m_LinkList.GetSize();
+  return m_bIsParsed ? pdfium::CollectionSize<int>(m_LinkList) : -1;
 }
 
 void CPDF_LinkExtract::ParseLink() {
   int start = 0, pos = 0;
   int TotalChar = m_pTextPage->CountChars();
   while (pos < TotalChar) {
     FPDF_CHAR_INFO pageChar;
     m_pTextPage->GetCharInfo(pos, &pageChar);
     if (pageChar.m_Flag == FPDFTEXT_CHAR_GENERATED ||
         pageChar.m_Unicode == 0x20 || pos == TotalChar - 1) {
       int nCount = pos - start;
       if (pos == TotalChar - 1) {
         nCount++;
       }
       CFX_WideString strBeCheck;
       strBeCheck = m_pTextPage->GetPageText(start, nCount);
       if (strBeCheck.GetLength() > 5) {
         while (strBeCheck.GetLength() > 0) {
           FX_WCHAR ch = strBeCheck.GetAt(strBeCheck.GetLength() - 1);
           if (ch == L')' || ch == L',' || ch == L'>' || ch == L'.') {
             strBeCheck = strBeCheck.Mid(0, strBeCheck.GetLength() - 1);
             nCount--;
           } else {
             break;
           }
         }
         if (nCount > 5 &&
             (CheckWebLink(strBeCheck) || CheckMailLink(strBeCheck))) {
-          AppendToLinkList(start, nCount, strBeCheck);
+          m_LinkList.push_back(
+              std::unique_ptr<Item>(new Item(start, nCount, strBeCheck)));
         }
       }
       start = ++pos;
     } else {
       pos++;
     }
   }
 }
 
 FX_BOOL CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck) {
@@ skipping 85 matching lines @@
     }
     pPos = i;
   }
 
   if (str.Find(L"mailto:") == -1) {
     str = L"mailto:" + str;
   }
   return TRUE;
 }
 
-void CPDF_LinkExtract::AppendToLinkList(int start,
-                                        int count,
-                                        const CFX_WideString& strUrl) {
-  CPDF_LinkExt* linkInfo = new CPDF_LinkExt;
-  linkInfo->m_strUrl = strUrl;
-  linkInfo->m_Start = start;
-  linkInfo->m_Count = count;
-  m_LinkList.Add(linkInfo);
+CFX_WideString CPDF_LinkExtract::GetURL(int index) const {

[dsinclair, 2016/04/20 13:05:19]

Can index be changed from an int to a size_t so we know it's > 0?

[Tom Sepez, 2016/04/20 19:07:39]

Done.  Pushed negative value checking up to API calls.

+  if (!m_bIsParsed || index < 0 ||

[Lei Zhang, 2016/04/19 23:52:06]

Helper function instead of repeating this thrice?

[Tom Sepez, 2016/04/20 19:07:39]

Nah, short enough to prefer transparency over consolidation.

+      index >= pdfium::CollectionSize<int>(m_LinkList)) {
+    return L"";
+  }
+  return m_LinkList[index]->m_strUrl;
 }
 
-CFX_WideString CPDF_LinkExtract::GetURL(int index) const {
-  if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
-    return L"";
-  }
-  CPDF_LinkExt* link = NULL;
-  link = m_LinkList.GetAt(index);
-  if (!link) {
-    return L"";
-  }
-  return link->m_strUrl;
-}
 void CPDF_LinkExtract::GetBoundedSegment(int index,

[dsinclair, 2016/04/20 13:05:19]

size_t?

[Tom Sepez, 2016/04/20 19:07:39]

Done.

                                          int& start,
                                          int& count) const {
-  if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
+  if (!m_bIsParsed || index < 0 ||
+      index >= pdfium::CollectionSize<int>(m_LinkList)) {
     return;
   }
-  CPDF_LinkExt* link = NULL;
-  link = m_LinkList.GetAt(index);
-  if (!link) {
-    return;
-  }
-  start = link->m_Start;
-  count = link->m_Count;
+  start = m_LinkList[index]->m_Start;
+  count = m_LinkList[index]->m_Count;
 }
 
 void CPDF_LinkExtract::GetRects(int index, CFX_RectArray& rects) const {

[dsinclair, 2016/04/20 13:05:19]

size_t?

[Tom Sepez, 2016/04/20 19:07:39]

Done.

-  if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
+  if (!m_bIsParsed || index < 0 ||
+      index >= pdfium::CollectionSize<int>(m_LinkList)) {
     return;
   }
-  CPDF_LinkExt* link = NULL;
-  link = m_LinkList.GetAt(index);
-  if (!link) {
-    return;
-  }
-  m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
+  m_pTextPage->GetRectArray(m_LinkList[index]->m_Start,
+                            m_LinkList[index]->m_Count, rects);
 }