commit 3624171cb516fbec7fad4a6919cc6be2d7821019
author Lei Zhang <thestig@chromium.org> Tue Nov 09 18:41:30 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 09 18:41:30 2021 +0000
tree 17f7c85c50e93d81ad81333bd284d4774873e168
parent 91946064bb1acea9c66dc1dd653a50208dee9e83

Get rid of `pair_index` in IndexSearchResult.

Replace it with a more straight-forward index into an array, so code
that uses the index does not have to multiply by 2 every time.

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

core/fpdfdoc/cpdf_nametree.cpp

diff --git a/core/fpdfdoc/cpdf_nametree.cpp b/core/fpdfdoc/cpdf_nametree.cpp
index fccb2ad..fb37cad 100644
--- a/core/fpdfdoc/cpdf_nametree.cpp
+++ b/core/fpdfdoc/cpdf_nametree.cpp
@@ -245,9 +245,8 @@
   CPDF_Object* value;
   // The leaf node that holds `key` and `value`.
   CPDF_Array* container;
-  // The pair index for `key` and `value` in `container`.
-  // Note that a value of 3 means `key` is at index 6 and `value` is at index 7.
-  int pair_index;
+  // The index for `key` in `container`. Must be even.
+  int index;
 };
 
 // Find the `nTargetPairIndex` node in the tree with root `pNode`. `nLevel`
@@ -269,16 +268,16 @@
       return absl::nullopt;
     }
 
-    int pair_index = nTargetPairIndex - *nCurPairIndex;
-    CPDF_Object* value = pNames->GetDirectObjectAt(pair_index * 2 + 1);
+    int index = 2 * (nTargetPairIndex - *nCurPairIndex);
+    CPDF_Object* value = pNames->GetDirectObjectAt(index + 1);
     if (!value)
       return absl::nullopt;
 
     IndexSearchResult result;
-    result.key = pNames->GetUnicodeTextAt(pair_index * 2);
+    result.key = pNames->GetUnicodeTextAt(index);
     result.value = value;
     result.container = pNames;
-    result.pair_index = pair_index;
+    result.index = index;
     return result;
   }
 
@@ -496,8 +495,8 @@
 
   // Remove the name and the object from the leaf array |pFind|.
   CPDF_Array* pFind = result.value().container;
-  pFind->RemoveAt(result.value().pair_index * 2 + 1);
-  pFind->RemoveAt(result.value().pair_index * 2);
+  pFind->RemoveAt(result.value().index + 1);
+  pFind->RemoveAt(result.value().index);
 
   // Delete empty nodes and update the limits of |pFind|'s ancestors as needed.
   UpdateNodesAndLimitsUponDeletion(m_pRoot.Get(), pFind, result.value().key, 0);