commit 84354c00ee58583712192ed066a8aaf31cf315e9
author Tom Sepez <tsepez@chromium.org> Fri Apr 02 21:09:04 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Apr 02 21:09:04 2021 +0000
tree de3f5ef1e2fce7f692dd7fee3299dcd1c2dd8f2c
parent 0020b75e73c520b84ea101e3a84173e006376bba

Try to clean up CPDF_LinkList.

Extra private method doesn't make things clearer.
Re-order impl to match header.

Change-Id: I2858015481cb06222cbf30200e6fed77c389e5bf
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/78951
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fpdfdoc/cpdf_linklist.cpp

diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp
index cb7ca0e..0a4c791 100644
--- a/core/fpdfdoc/cpdf_linklist.cpp
+++ b/core/fpdfdoc/cpdf_linklist.cpp
@@ -14,22 +14,6 @@
 
 CPDF_LinkList::~CPDF_LinkList() = default;
 
-const std::vector<RetainPtr<CPDF_Dictionary>>* CPDF_LinkList::GetPageLinks(
-    CPDF_Page* pPage) {
-  uint32_t objnum = pPage->GetDict()->GetObjNum();
-  if (objnum == 0)
-    return nullptr;
-
-  auto it = m_PageMap.find(objnum);
-  if (it != m_PageMap.end())
-    return &it->second;
-
-  // std::map::operator[] forces the creation of a map entry.
-  auto& page_link_list = m_PageMap[objnum];
-  LoadPageLinks(pPage, &page_link_list);
-  return &page_link_list;
-}
-
 CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage,
                                         const CFX_PointF& point,
                                         int* z_order) {
@@ -55,17 +39,27 @@
   return CPDF_Link();
 }
 
-void CPDF_LinkList::LoadPageLinks(
-    CPDF_Page* pPage,
-    std::vector<RetainPtr<CPDF_Dictionary>>* pList) {
+const std::vector<RetainPtr<CPDF_Dictionary>>* CPDF_LinkList::GetPageLinks(
+    CPDF_Page* pPage) {
+  uint32_t objnum = pPage->GetDict()->GetObjNum();
+  if (objnum == 0)
+    return nullptr;
+
+  auto it = m_PageMap.find(objnum);
+  if (it != m_PageMap.end())
+    return &it->second;
+
+  // std::map::operator[] forces the creation of a map entry.
+  auto* page_link_list = &m_PageMap[objnum];
   CPDF_Array* pAnnotList = pPage->GetDict()->GetArrayFor("Annots");
   if (!pAnnotList)
-    return;
+    return page_link_list;
 
   for (size_t i = 0; i < pAnnotList->size(); ++i) {
     CPDF_Dictionary* pAnnot = pAnnotList->GetDictAt(i);
     bool add_link = (pAnnot && pAnnot->GetStringFor("Subtype") == "Link");
     // Add non-links as nullptrs to preserve z-order.
-    pList->emplace_back(add_link ? pAnnot : nullptr);
+    page_link_list->emplace_back(add_link ? pAnnot : nullptr);
   }
+  return page_link_list;
 }

core/fpdfdoc/cpdf_linklist.h

diff --git a/core/fpdfdoc/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h
index 32320d0..50cd1f4 100644
--- a/core/fpdfdoc/cpdf_linklist.h
+++ b/core/fpdfdoc/cpdf_linklist.h
@@ -29,8 +29,6 @@
 
  private:
   const std::vector<RetainPtr<CPDF_Dictionary>>* GetPageLinks(CPDF_Page* pPage);
-  void LoadPageLinks(CPDF_Page* pPage,
-                     std::vector<RetainPtr<CPDF_Dictionary>>* pList);
 
   std::map<uint32_t, std::vector<RetainPtr<CPDF_Dictionary>>> m_PageMap;
 };