Clean up xfa_fontmgr.cpp.

xfa/fgas/layout/fgas_textbreak.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 "xfa/fgas/layout/fgas_textbreak.h"
 
 #include <algorithm>
 
@@ skipping 625 matching lines @@
   return std::max(dwRet1, dwRet2);
 }
 
 void CFX_TxtBreak::EndBreak_UpdateArabicShapes() {
   ASSERT(m_bArabicShapes);
   int32_t iCount = m_pCurLine->CountChars();
   if (iCount < 2) {
     return;
   }
   int32_t& iLineWidth = m_pCurLine->m_iWidth;
-  CFX_Char *pCur, *pNext;
-  pCur = m_pCurLine->GetCharPtr(0);
+  CFX_Char* pCur = m_pCurLine->GetCharPtr(0);
   FX_BOOL bPrevNum = (pCur->m_dwCharStyles & FX_TXTCHARSTYLE_ArabicIndic) != 0;
   pCur = m_pCurLine->GetCharPtr(1);
   FX_WCHAR wch, wForm;
   FX_BOOL bNextNum;
-  int32_t i = 1, iCharWidth, iRotation;
+  int32_t i = 1;
+  int32_t iCharWidth;
+  int32_t iRotation;
+  CFX_Char* pNext;
   do {
     i++;
     if (i < iCount) {
       pNext = m_pCurLine->GetCharPtr(i);
       bNextNum = (pNext->m_dwCharStyles & FX_TXTCHARSTYLE_ArabicIndic) != 0;
     } else {
       pNext = nullptr;
       bNextNum = FALSE;
     }
     wch = pCur->m_wCharCode;
@@ skipping 999 matching lines @@
       if (bRTLPiece) {
         rect.left -= fCharSize;
         fStart -= fCharSize;
       } else {
         fStart += fCharSize;
       }
       rect.width = fCharSize;
     }
     if (bCharBBox && !bRet) {
       int32_t iCharWidth = 1000;
-      pFont->GetCharWidth(wch, iCharWidth);
+      pFont->GetCharWidth(wch, iCharWidth, false);
       FX_FLOAT fRTLeft = 0, fCharWidth = 0;
       if (iCharWidth > 0) {
         fCharWidth = iCharWidth * fScale;
         fRTLeft = fLeft;
         if (bCombText) {
           fRTLeft = (rect.width - fCharWidth) / 2.0f;
         }
       }
       CFX_RectF rtBBoxF;
       if (bVertical) {
@@ skipping 54 matching lines @@
 CFX_TxtLine::CFX_TxtLine(int32_t iBlockSize)
     : m_pLineChars(new CFX_TxtCharArray),
       m_pLinePieces(new CFX_TxtPieceArray(16)),
       m_iStart(0),
       m_iWidth(0),
       m_iArabicChars(0) {}
 
 CFX_TxtLine::~CFX_TxtLine() {
   RemoveAll();
 }