From 4797c4240cb9e2d8cd36c583d46cd52ff94af95d Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Mon, 13 Feb 2017 15:44:23 -0500
Subject: Convert CFX_FloatPoint to CFX_PointF

The two classes store the same information, remove the CFX_FloatPoint variant.

Change-Id: Ie598c2ba5af04fb2bb3347dd48c30fd5e4845e62
Reviewed-on: https://pdfium-review.googlesource.com/2612
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 fpdfsdk/pdfwindow/PWL_Caret.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'fpdfsdk/pdfwindow/PWL_Caret.cpp')

diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp
index 6636170e81..06c8e31ce7 100644
--- a/fpdfsdk/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
@@ -14,6 +14,8 @@
 
 #define PWL_CARET_FLASHINTERVAL 500
 
+PWL_CARET_INFO::PWL_CARET_INFO() : bVisible(false) {}
+
 CPWL_Caret::CPWL_Caret() : m_bFlash(false), m_fWidth(0.4f), m_nDelay(0) {}
 
 CPWL_Caret::~CPWL_Caret() {}
@@ -23,7 +25,7 @@ CFX_ByteString CPWL_Caret::GetClassName() const {
 }
 
 void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
-  GetCaretApp(sAppStream, CFX_FloatPoint(0.0f, 0.0f));
+  GetCaretApp(sAppStream, CFX_PointF());
 }
 
 void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
@@ -60,7 +62,7 @@ void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream,
-                             const CFX_FloatPoint& ptOffset) {
+                             const CFX_PointF& ptOffset) {
   if (IsVisible() && m_bFlash) {
     CFX_ByteTextBuf sCaret;
 
@@ -85,7 +87,7 @@ void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream,
 }
 
 CFX_ByteString CPWL_Caret::GetCaretAppearanceStream(
-    const CFX_FloatPoint& ptOffset) {
+    const CFX_PointF& ptOffset) {
   CFX_ByteTextBuf sCaret;
   GetCaretApp(sCaret, ptOffset);
   return sCaret.MakeString();
@@ -106,8 +108,8 @@ CFX_FloatRect CPWL_Caret::GetCaretRect() const {
 }
 
 void CPWL_Caret::SetCaret(bool bVisible,
-                          const CFX_FloatPoint& ptHead,
-                          const CFX_FloatPoint& ptFoot) {
+                          const CFX_PointF& ptHead,
+                          const CFX_PointF& ptFoot) {
   if (bVisible) {
     if (IsVisible()) {
       if (m_ptHead != ptHead || m_ptFoot != ptFoot) {
@@ -126,8 +128,8 @@ void CPWL_Caret::SetCaret(bool bVisible,
       Move(m_rcInvalid, false, true);
     }
   } else {
-    m_ptHead = CFX_FloatPoint();
-    m_ptFoot = CFX_FloatPoint();
+    m_ptHead = CFX_PointF();
+    m_ptFoot = CFX_PointF();
     m_bFlash = false;
     if (IsVisible()) {
       EndTimer();
-- 
cgit v1.2.3