Remove CFX_MapPtrToPtr in xfa/fgas, part 2

xfa/fgas/layout/fgas_rtfbreak.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_rtfbreak.h"
 
 #include <algorithm>
 
@@ skipping 1301 matching lines @@
         if (!bEmptyChar) {
           CFX_PointF ptOffset;
           bool bAdjusted = false;
           if (pAdjustPos) {
             bAdjusted = pAdjustPos(wForm, bMBCSCode, pFont, fFontSize,
                                    bVerticalChar, ptOffset);
           }
           if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) {
             CFX_Rect rtBBox;
             rtBBox.Reset();
-            if (pFont->GetCharBBox(wForm, rtBBox, bMBCSCode)) {
+            if (pFont->GetCharBBox(wForm, &rtBBox, bMBCSCode)) {
               ptOffset.x = fFontSize * (850 - rtBBox.right()) / 1000.0f;
               ptOffset.y = fFontSize * (1000 - rtBBox.height) / 2000.0f;
             }
           }
           pCharPos->m_OriginX = fX + ptOffset.x;
           pCharPos->m_OriginY = fY - ptOffset.y;
         }
         if (!bRTLPiece && dwCharType != FX_CHARTYPE_Combination) {
           if (bVerticalDoc) {
             fY += fCharHeight;
@@ skipping 96 matching lines @@
   FX_FLOAT fFontSize = pText->fFontSize;
   int32_t iFontSize = FXSYS_round(fFontSize * 20.0f);
   FX_FLOAT fScale = fFontSize / 1000.0f;
   CFX_RetainPtr<CFGAS_GEFont> pFont = pText->pFont;
   if (!pFont)
     bCharBBox = false;
 
   CFX_Rect bbox;
   bbox.Set(0, 0, 0, 0);
   if (bCharBBox)
-    bCharBBox = pFont->GetBBox(bbox);
+    bCharBBox = pFont->GetBBox(&bbox);
 
   FX_FLOAT fLeft = std::max(0.0f, bbox.left * fScale);
   FX_FLOAT fHeight = FXSYS_fabs(bbox.height * fScale);
   rtArray.RemoveAll();
   rtArray.SetSize(iLength);
   uint32_t dwStyles = pText->dwLayoutStyles;
   bool bVertical = (dwStyles & FX_RTFLAYOUTSTYLE_VerticalLayout) != 0;
   bool bSingleLine = (dwStyles & FX_RTFLAYOUTSTYLE_SingleLine) != 0;
   bool bCombText = (dwStyles & FX_TXTLAYOUTSTYLE_CombText) != 0;
   FX_WCHAR wch, wLineBreakChar = pText->wLineBreakChar;
@@ skipping 109 matching lines @@
       fFontSize(12.0f),
       dwLayoutStyles(0),
       iCharRotation(0),
       iBidiLevel(0),
       pRect(nullptr),
       wLineBreakChar(L'\n'),
       iHorizontalScale(100),
       iVerticalScale(100) {}
 
 FX_RTFTEXTOBJ::~FX_RTFTEXTOBJ() {}