From 63f545c485c063831ecb58fb492f96fe5f462fd1 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Tue, 13 Sep 2016 16:08:49 -0700
Subject: CFX_FloatPoint default constructor and equals operators

Review-Url: https://codereview.chromium.org/2341453002
---
 core/fpdfdoc/cpvt_generateap.cpp    | 13 ++++++-------
 core/fpdfdoc/include/cpvt_line.h    |  3 +--
 core/fpdfdoc/include/cpvt_word.h    |  1 -
 core/fxcrt/include/fx_coordinates.h |  6 ++++++
 4 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 741b2365f5..dbfcdbffed 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -237,7 +237,7 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
       vt.SetText(swValue);
       vt.RearrangeAll();
       CFX_FloatRect rcContent = vt.GetContentRect();
-      CFX_FloatPoint ptOffset(0.0f, 0.0f);
+      CFX_FloatPoint ptOffset;
       if (!bMultiLine) {
         ptOffset =
             CFX_FloatPoint(0.0f, (rcContent.Height() - rcBody.Height()) / 2.0f);
@@ -1083,13 +1083,12 @@ CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
   CFX_ByteTextBuf sEditStream;
   CFX_ByteTextBuf sLineStream;
   CFX_ByteTextBuf sWords;
-  CFX_FloatPoint ptOld(0.0f, 0.0f);
-  CFX_FloatPoint ptNew(0.0f, 0.0f);
+  CFX_FloatPoint ptOld;
+  CFX_FloatPoint ptNew;
   int32_t nCurFontIndex = -1;
+  CPVT_WordPlace oldplace;
 
   pIterator->SetAt(0);
-
-  CPVT_WordPlace oldplace;
   while (pIterator->NextWord()) {
     CPVT_WordPlace place = pIterator->GetAt();
     if (bContinuous) {
@@ -1110,7 +1109,7 @@ CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
           ptNew = CFX_FloatPoint(line.ptLine.x + ptOffset.x,
                                  line.ptLine.y + ptOffset.y);
         }
-        if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
+        if (ptNew != ptOld) {
           sLineStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
                       << " Td\n";
           ptOld = ptNew;
@@ -1135,7 +1134,7 @@ CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
       if (pIterator->GetWord(word)) {
         ptNew = CFX_FloatPoint(word.ptWord.x + ptOffset.x,
                                word.ptWord.y + ptOffset.y);
-        if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
+        if (ptNew != ptOld) {
           sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
                       << " Td\n";
           ptOld = ptNew;
diff --git a/core/fpdfdoc/include/cpvt_line.h b/core/fpdfdoc/include/cpvt_line.h
index ea0f899e19..d6c74edb4e 100644
--- a/core/fpdfdoc/include/cpvt_line.h
+++ b/core/fpdfdoc/include/cpvt_line.h
@@ -12,8 +12,7 @@
 #include "core/fxcrt/include/fx_system.h"
 
 struct CPVT_Line {
-  CPVT_Line()
-      : ptLine(0, 0), fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f) {}
+  CPVT_Line() : fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f) {}
 
   CPVT_WordPlace lineplace;
   CPVT_WordPlace lineEnd;
diff --git a/core/fpdfdoc/include/cpvt_word.h b/core/fpdfdoc/include/cpvt_word.h
index f7b7b23dac..b2af4ec6fa 100644
--- a/core/fpdfdoc/include/cpvt_word.h
+++ b/core/fpdfdoc/include/cpvt_word.h
@@ -29,7 +29,6 @@ struct CPVT_Word {
 inline CPVT_Word::CPVT_Word()
     : Word(0),
       nCharset(0),
-      ptWord(0.0f, 0.0f),
       fAscent(0.0f),
       fDescent(0.0f),
       fWidth(0.0f),
diff --git a/core/fxcrt/include/fx_coordinates.h b/core/fxcrt/include/fx_coordinates.h
index 7da6057ed4..bfdc46cbf2 100644
--- a/core/fxcrt/include/fx_coordinates.h
+++ b/core/fxcrt/include/fx_coordinates.h
@@ -179,8 +179,14 @@ struct FX_RECT {
 // LBRT rectangles (y-axis runs upwards).
 class CFX_FloatPoint {
  public:
+  CFX_FloatPoint() : x(0.0f), y(0.0f) {}
   CFX_FloatPoint(FX_FLOAT xx, FX_FLOAT yy) : x(xx), y(yy) {}
 
+  bool operator==(const CFX_FloatPoint& that) const {
+    return x == that.x && y == that.y;
+  }
+  bool operator!=(const CFX_FloatPoint& that) const { return !(*this == that); }
+
   FX_FLOAT x;
   FX_FLOAT y;
 };
-- 
cgit v1.2.3