commit c43aa392dc97d14c6d1bc527864df1fe92216800
author Lei Zhang <thestig@chromium.org> Mon Jun 08 18:59:20 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Jun 08 18:59:20 2020 +0000
tree 90137f62b14ff32fa3217f097629fe8bccc706bc
parent ffa2f657a3cf0a9f4548fc8b8c0d816247dda6fb

Simplify more code in CFDE_TextOut.

- a > b ? a : b => std::max(a, b)
- pdfium::CollectionSize<size_t>(container) => container.size()

Change-Id: I6a7a8e4494194b8263def5c9cf7ad7d01fcc88dd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70433
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

xfa/fde/cfde_textout.cpp

diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index ab0e030..35d66c9 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -247,7 +247,7 @@
   if (CFX_BreakTypeNoneOrPiece(dwBreakStatus))
     return false;
 
-  float fLineStep = (m_fLineSpace > m_fFontSize) ? m_fLineSpace : m_fFontSize;
+  float fLineStep = std::max(m_fLineSpace, m_fFontSize);
   float fLineWidth = 0.0f;
   for (int32_t i = 0; i < m_pTxtBreak->CountBreakPieces(); i++) {
     const CFX_BreakPiece* pPiece = m_pTxtBreak->GetBreakPieceUnstable(i);
@@ -317,10 +317,10 @@
 
   m_wsText = str;
 
-  if (pdfium::CollectionSize<size_t>(m_CharWidths) < str.GetLength())
+  if (m_CharWidths.size() < str.GetLength())
     m_CharWidths.resize(str.GetLength(), 0);
 
-  float fLineStep = (m_fLineSpace > m_fFontSize) ? m_fLineSpace : m_fFontSize;
+  float fLineStep = std::max(m_fLineSpace, m_fFontSize);
   float fLineStop = rect.bottom();
   m_fLinePos = rect.top;
   size_t start_char = 0;
@@ -362,7 +362,7 @@
                                   const CFX_RectF& rect,
                                   size_t* pStartChar,
                                   int32_t* pPieceWidths) {
-  float fLineStep = (m_fLineSpace > m_fFontSize) ? m_fLineSpace : m_fFontSize;
+  float fLineStep = std::max(m_fLineSpace, m_fFontSize);
   bool bNeedReload = false;
   int32_t iLineWidth = FXSYS_roundf(rect.Width() * 20000.0f);
   int32_t iCount = m_pTxtBreak->CountBreakPieces();
@@ -374,7 +374,7 @@
     int32_t j = 0;
     for (; j < iPieceChars; j++) {
       const CFX_Char* pTC = pPiece->GetChar(j);
-      int32_t iCurCharWidth = pTC->m_iCharWidth > 0 ? pTC->m_iCharWidth : 0;
+      int32_t iCurCharWidth = std::max(pTC->m_iCharWidth, 0);
       if (m_Styles.single_line_ || !m_Styles.line_wrap_) {
         if (iLineWidth - *pPieceWidths - iWidth < iCurCharWidth) {
           bNeedReload = true;