commit b3673bb15f853a70d02b862facb9c0fc63e3bd3b
author Lei Zhang <thestig@chromium.org> Thu Feb 13 13:43:21 2025 -0800
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 13 13:43:21 2025 -0800
tree f33ea39fd3105abaf919a2935f4106cf4c7cc400
parent eebb95eb9572bc724804b4dbb2f449a73a1e96fa

Store frequently used function results in variables in GetLooseBounds()

Stop repeatedly calling charinfo.text_object() and
charinfo.text_object()->GetFont(). This makes it slightly easier to
refactor the code in the future, if the GetLooseBounds() parameters
change.

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

core/fpdftext/cpdf_textpage.cpp

diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 47cff23..5d2d41f 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -267,11 +267,13 @@
 }
 
 CFX_FloatRect GetLooseBounds(const CPDF_TextPage::CharInfo& charinfo) {
-  float font_size = GetFontSize(charinfo.text_object());
-  if (charinfo.text_object() && !FXSYS_IsFloatZero(font_size)) {
-    bool is_vert_writing = charinfo.text_object()->GetFont()->IsVertWriting();
-    if (is_vert_writing && charinfo.text_object()->GetFont()->IsCIDFont()) {
-      CPDF_CIDFont* pCIDFont = charinfo.text_object()->GetFont()->AsCIDFont();
+  const CPDF_TextObject* text_object = charinfo.text_object();
+  float font_size = GetFontSize(text_object);
+  if (text_object && !FXSYS_IsFloatZero(font_size)) {
+    RetainPtr<CPDF_Font> font = text_object->GetFont();
+    bool is_vert_writing = font->IsVertWriting();
+    if (is_vert_writing && font->IsCIDFont()) {
+      CPDF_CIDFont* pCIDFont = font->AsCIDFont();
       uint16_t cid = pCIDFont->CIDFromCharCode(charinfo.char_code());
 
       CFX_Point16 vertical_origin = pCIDFont->GetVertOrigin(cid);
@@ -290,10 +292,10 @@
       return char_box;
     }
 
-    FX_RECT font_bbox = charinfo.text_object()->GetFont()->GetFontBBox();
+    FX_RECT font_bbox = font->GetFontBBox();
     if (font_bbox.Height() != 0) {
       // Compute `left` and `right` based on the individual character's `width`.
-      float width = charinfo.text_object()->GetCharWidth(charinfo.char_code());
+      float width = text_object->GetCharWidth(charinfo.char_code());
       CFX_Matrix inverse_matrix = charinfo.matrix().GetInverse();
       CFX_PointF original_origin = inverse_matrix.Transform(charinfo.origin());
       float left = original_origin.x;