Remove CPVT_Size and CPVT_FloatRange.

core/fpdfdoc/pdf_vt.h

 // 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
 
 #ifndef CORE_FPDFDOC_PDF_VT_H_
 #define CORE_FPDFDOC_PDF_VT_H_
 
 #include "core/fpdfdoc/cpvt_floatrect.h"
 #include "core/fpdfdoc/cpvt_lineinfo.h"
 #include "core/fpdfdoc/include/cpvt_wordrange.h"
 
 class CPDF_VariableText;
 
 struct CPVT_WordInfo;
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb))
 
-class CPVT_Size {
- public:
-  CPVT_Size() : x(0.0f), y(0.0f) {}
-  CPVT_Size(FX_FLOAT other_x, FX_FLOAT other_y) {
-    x = other_x;
-    y = other_y;
-  }
-  FX_FLOAT x, y;
-};
-
-struct CPVT_FloatRange {
-  CPVT_FloatRange() : fMin(0.0f), fMax(0.0f) {}
-  CPVT_FloatRange(FX_FLOAT min, FX_FLOAT max) : fMin(min), fMax(max) {}
-  FX_FLOAT Range() const { return fMax - fMin; }
-  FX_FLOAT fMin, fMax;
-};
 template <class TYPE>
 class CPVT_ArrayTemplate : public CFX_ArrayTemplate<TYPE> {
  public:
   FX_BOOL IsEmpty() { return CFX_ArrayTemplate<TYPE>::GetSize() <= 0; }
   TYPE GetAt(int nIndex) const {
     if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
       return CFX_ArrayTemplate<TYPE>::GetAt(nIndex);
     }
     return NULL;
   }
   void RemoveAt(int nIndex) {
     if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
       CFX_ArrayTemplate<TYPE>::RemoveAt(nIndex);
     }
   }
 };
-class CLine {
+class CLine final {
  public:
   CLine();
-  virtual ~CLine();
+  ~CLine();
+
   CPVT_WordPlace GetBeginWordPlace() const;
   CPVT_WordPlace GetEndWordPlace() const;
   CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace LinePlace;
   CPVT_LineInfo m_LineInfo;
 };
-class CLines {
+
+class CLines final {
  public:
   CLines() : m_nTotal(0) {}
-  virtual ~CLines() { RemoveAll(); }
+  ~CLines() { RemoveAll(); }
+
   int32_t GetSize() const { return m_Lines.GetSize(); }
   CLine* GetAt(int32_t nIndex) const { return m_Lines.GetAt(nIndex); }
   void Empty() { m_nTotal = 0; }
   void RemoveAll() {
     for (int32_t i = 0, sz = GetSize(); i < sz; i++) {
       delete GetAt(i);
     }
     m_Lines.RemoveAll();
     m_nTotal = 0;
   }
@@ skipping 16 matching lines @@
 
  private:
   CPVT_ArrayTemplate<CLine*> m_Lines;
   int32_t m_nTotal;
 };
 
 class CPDF_EditContainer {
  public:
   CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0) {}
   virtual ~CPDF_EditContainer() {}
+
   virtual void SetPlateRect(const CFX_FloatRect& rect) { m_rcPlate = rect; }
   virtual const CFX_FloatRect& GetPlateRect() const { return m_rcPlate; }
   virtual void SetContentRect(const CPVT_FloatRect& rect) {
     m_rcContent = rect;
   }
   virtual CFX_FloatRect GetContentRect() const { return m_rcContent; }
   FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; }
   FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; }
-  CPVT_Size GetPlateSize() const {
-    return CPVT_Size(GetPlateWidth(), GetPlateHeight());
+  CFX_SizeF GetPlateSize() const {
+    return CFX_SizeF(GetPlateWidth(), GetPlateHeight());
   }
   CFX_FloatPoint GetBTPoint() const {
     return CFX_FloatPoint(m_rcPlate.left, m_rcPlate.top);
   }
   CFX_FloatPoint GetETPoint() const {
     return CFX_FloatPoint(m_rcPlate.right, m_rcPlate.bottom);
   }
   inline CFX_FloatPoint InToOut(const CFX_FloatPoint& point) const {
     return CFX_FloatPoint(point.x + GetBTPoint().x, GetBTPoint().y - point.y);
   }
@@ skipping 14 matching lines @@
     return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x,
                           ptRightBottom.y);
   }
 
  private:
   CFX_FloatRect m_rcPlate;
   CPVT_FloatRect m_rcContent;
 };
 
 #endif  // CORE_FPDFDOC_PDF_VT_H_