Fixup FX_RECT and FX_SMALL_RECT classes.

core/src/fpdftext/fpdf_text_int.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/src/fpdftext/text_int.h"
 
 #include <algorithm>
 #include <cctype>
@@ skipping 866 matching lines @@
       if (pPageObj->IsText()) {
         ProcessTextObject(pPageObj->AsText(), curFormMatrix, pObjectList, it);
       } else if (pPageObj->IsForm()) {
         ProcessFormObject(pPageObj->AsForm(), curFormMatrix);
       }
     }
   }
 }
 
 int CPDF_TextPage::GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const {
-  if (charCode == -1) {
+  if (charCode == -1)
     return 0;
-  }
-  int w = pFont->GetCharWidthF(charCode);
-  if (w == 0) {
-    CFX_ByteString str;
-    pFont->AppendChar(str, charCode);
-    w = pFont->GetStringWidth(str, 1);
-    if (w == 0) {
-      FX_RECT BBox;
-      pFont->GetCharBBox(charCode, BBox);
-      w = BBox.right - BBox.left;
-    }
-  }
-  return w;
+
+  if (int w = pFont->GetCharWidthF(charCode))
+    return w;
+
+  CFX_ByteString str;
+  pFont->AppendChar(str, charCode);
+  if (int w = pFont->GetStringWidth(str, 1))
+    return w;
+
+  return pFont->GetCharBBox(charCode).Width();
 }
 
 void CPDF_TextPage::OnPiece(CFX_BidiChar* pBidi, CFX_WideString& str) {
   CFX_BidiChar::Segment seg = pBidi->GetSegmentInfo();
   if (seg.direction == CFX_BidiChar::RIGHT) {
     for (int i = seg.start + seg.count; i > seg.start; i--) {
       m_TextBuf.AppendChar(str.GetAt(i - i));
       m_CharList.push_back(m_TempCharList[i - 1]);
     }
   } else {
@@ skipping 545 matching lines @@
     charinfo.m_CharCode = item.m_CharCode;
     if (bNoUnicode) {
       charinfo.m_Flag = FPDFTEXT_CHAR_UNUNICODE;
     } else {
       charinfo.m_Flag = FPDFTEXT_CHAR_NORMAL;
     }
     charinfo.m_pTextObj = pTextObj;
     charinfo.m_OriginX = 0, charinfo.m_OriginY = 0;
     matrix.Transform(item.m_OriginX, item.m_OriginY, charinfo.m_OriginX,
                      charinfo.m_OriginY);
-    FX_RECT rect(0, 0, 0, 0);
-    rect.Intersect(0, 0, 0, 0);
-    charinfo.m_pTextObj->GetFont()->GetCharBBox(charinfo.m_CharCode, rect);
+    FX_RECT rect =
+        charinfo.m_pTextObj->GetFont()->GetCharBBox(charinfo.m_CharCode);
     charinfo.m_CharBox.top =
         rect.top * pTextObj->GetFontSize() / 1000 + item.m_OriginY;
     charinfo.m_CharBox.left =
         rect.left * pTextObj->GetFontSize() / 1000 + item.m_OriginX;
     charinfo.m_CharBox.right =
         rect.right * pTextObj->GetFontSize() / 1000 + item.m_OriginX;
     charinfo.m_CharBox.bottom =
         rect.bottom * pTextObj->GetFontSize() / 1000 + item.m_OriginY;
     if (fabsf(charinfo.m_CharBox.top - charinfo.m_CharBox.bottom) < 0.01f) {
       charinfo.m_CharBox.top =
@@ skipping 1013 matching lines @@
   if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
     return;
   }
   CPDF_LinkExt* link = NULL;
   link = m_LinkList.GetAt(index);
   if (!link) {
     return;
   }
   m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }