commit d23a900fb4827b795adb71dfcf7b32fd809bc323
author Tom Sepez <tsepez@chromium.org> Fri Jun 18 01:00:28 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 18 01:00:28 2021 +0000
tree 56648b4e39fb405bd9cf78fb25eba5c423827e3b
parent 35c6ab3d7eab4bba9c2c16738cec3ed187b885cf

Combine block in CPVT_Section::SplitLines()

Duplicate test with no intervening code.

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

core/fpdfdoc/cpvt_section.cpp

diff --git a/core/fpdfdoc/cpvt_section.cpp b/core/fpdfdoc/cpvt_section.cpp
index 41318ea..6af10a1 100644
--- a/core/fpdfdoc/cpvt_section.cpp
+++ b/core/fpdfdoc/cpvt_section.cpp
@@ -519,13 +519,6 @@
     if (bTypeset) {
       fLineAscent = m_pVT->GetLineAscent();
       fLineDescent = m_pVT->GetLineDescent();
-    } else {
-      fLineAscent =
-          m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), fFontSize);
-      fLineDescent =
-          m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), fFontSize);
-    }
-    if (bTypeset) {
       line.nBeginWordIndex = -1;
       line.nEndWordIndex = -1;
       line.nTotalWord = 0;
@@ -533,6 +526,11 @@
       line.fLineAscent = fLineAscent;
       line.fLineDescent = fLineDescent;
       AddLine(line);
+    } else {
+      fLineAscent =
+          m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), fFontSize);
+      fLineDescent =
+          m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), fFontSize);
     }
     float fMaxY = m_pVT->GetLineLeading() + fLineAscent - fLineDescent;
     return CPVT_FloatRect(0, 0, 0, fMaxY);