Remove CPVT_Size and CPVT_FloatRange.

core/fpdfdoc/doc_vt.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 <algorithm>
 
 #include "core/fpdfdoc/cpvt_wordinfo.h"
 #include "core/fpdfdoc/csection.h"
@@ skipping 64 matching lines @@
 }
 CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo& lineinfo) {
   return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
 }
 CPVT_FloatRect CSection::Rearrange() {
   if (m_pVT->m_nCharArray > 0) {
     return CTypeset(this).CharArray();
   }
   return CTypeset(this).Typeset();
 }
-CPVT_Size CSection::GetSectionSize(FX_FLOAT fFontSize) {
+CFX_PointF CSection::GetSectionSize(FX_FLOAT fFontSize) {

[Wei Li, 2016/05/10 20:09:42]

Ditto for all below.

   return CTypeset(this).GetEditSize(fFontSize);
 }
 CPVT_WordPlace CSection::GetBeginWordPlace() const {
   if (CLine* pLine = m_LineArray.GetAt(0)) {
     return pLine->GetBeginWordPlace();
   }
   return SecPlace;
 }
 CPVT_WordPlace CSection::GetEndWordPlace() const {
   if (CLine* pLine = m_LineArray.GetAt(m_LineArray.GetSize() - 1)) {
@@ skipping 273 matching lines @@
     pLine->m_LineInfo.nBeginWordIndex = 0;
     pLine->m_LineInfo.nEndWordIndex = m_pSection->m_WordArray.GetSize() - 1;
     pLine->m_LineInfo.fLineY = y;
     pLine->m_LineInfo.fLineWidth = x - pLine->m_LineInfo.fLineX;
     pLine->m_LineInfo.fLineAscent = fLineAscent;
     pLine->m_LineInfo.fLineDescent = fLineDescent;
     y -= fLineDescent;
   }
   return m_rcRet = CPVT_FloatRect(0, 0, x, y);
 }
-CPVT_Size CTypeset::GetEditSize(FX_FLOAT fFontSize) {
+CFX_PointF CTypeset::GetEditSize(FX_FLOAT fFontSize) {
   ASSERT(m_pSection);
   ASSERT(m_pVT);
   SplitLines(FALSE, fFontSize);
-  return CPVT_Size(m_rcRet.Width(), m_rcRet.Height());
+  return CFX_PointF(m_rcRet.Width(), m_rcRet.Height());
 }
 CPVT_FloatRect CTypeset::Typeset() {
   ASSERT(m_pVT);
   m_pSection->m_LineArray.Empty();
   SplitLines(TRUE, 0.0f);
   m_pSection->m_LineArray.Clear();
   OutputLines();
   return m_rcRet;
 }
 
@@ skipping 366 matching lines @@
             }
             fPosX += m_pVT->GetWordWidth(*pWord);
           }
         }
         fPosY -= pLine->m_LineInfo.fLineDescent;
       }
     }
   }
   m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
 }