commit 143cc991e2667720b80ad3e5883a72bf6c5312e1
author Tom Sepez <tsepez@chromium.org> Fri Oct 05 21:30:22 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Oct 05 21:30:22 2018 +0000
tree 8b4203c1ae33ed245808e0f3f954dbc848d43a3a
parent 28df406817f501b4c133d56ef09cb0d6d90181ca

Tidy CPVT_WordRange

Change-Id: I6fea894fbf6d4865f8ca6bd70452c5730414f378
Reviewed-on: https://pdfium-review.googlesource.com/c/43551
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fpdfdoc/cpvt_wordrange.h

diff --git a/core/fpdfdoc/cpvt_wordrange.h b/core/fpdfdoc/cpvt_wordrange.h
index 5426154..fbc691f 100644
--- a/core/fpdfdoc/cpvt_wordrange.h
+++ b/core/fpdfdoc/cpvt_wordrange.h
@@ -14,42 +14,13 @@
 #include "core/fxcrt/fx_system.h"
 
 struct CPVT_WordRange {
-  CPVT_WordRange() {}
+  CPVT_WordRange() = default;
 
   CPVT_WordRange(const CPVT_WordPlace& begin, const CPVT_WordPlace& end)
       : BeginPos(begin), EndPos(end) {
     Normalize();
   }
 
-  void Reset() {
-    BeginPos.Reset();
-    EndPos.Reset();
-  }
-
-  void Set(const CPVT_WordPlace& begin, const CPVT_WordPlace& end) {
-    BeginPos = begin;
-    EndPos = end;
-    Normalize();
-  }
-
-  void SetBeginPos(const CPVT_WordPlace& begin) {
-    BeginPos = begin;
-    Normalize();
-  }
-
-  void SetEndPos(const CPVT_WordPlace& end) {
-    EndPos = end;
-    Normalize();
-  }
-
-  CPVT_WordRange Intersect(const CPVT_WordRange& that) const {
-    if (that.EndPos < BeginPos || that.BeginPos > EndPos)
-      return CPVT_WordRange();
-
-    return CPVT_WordRange(std::max(BeginPos, that.BeginPos),
-                          std::min(EndPos, that.EndPos));
-  }
-
   inline bool IsEmpty() const { return BeginPos == EndPos; }
   inline bool operator==(const CPVT_WordRange& wr) const {
     return wr.BeginPos == BeginPos && wr.EndPos == EndPos;

fpdfsdk/pwl/cpwl_edit.cpp

diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 59fb921..6126bfd 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -631,8 +631,6 @@
 CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place,
                                             bool bLatin,
                                             bool bArabic) const {
-  CPVT_WordRange range;
-
   CPWL_EditImpl_Iterator* pIterator = m_pEdit->GetIterator();
   CPVT_Word wordinfo;
   CPVT_WordPlace wpStart(place), wpEnd(place);
@@ -676,6 +674,5 @@
     } while (pIterator->PrevWord());
   }
 
-  range.Set(wpStart, wpEnd);
-  return range;
+  return CPVT_WordRange(wpStart, wpEnd);
 }