commit 892acec62762919a545122af0a11947e20cd10b7
author Tom Sepez <tsepez@chromium.org> Tue May 25 19:12:21 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 25 19:12:21 2021 +0000
tree 51c1f29dbc9dfb6363aee3e8290e69bafa49d9df
parent 44e2a04d43ca2a33bb506f326793a3215ca35bf1

Remove boolean argument from CPVT_VariableText::AdjustLineHeader().

It is always called with a literal |true| or |false| argument, so is
is cleaner to split into two single-purpose methods. Rename to remove
the word "adjust" since it computes a new place rather than mutating
anything.

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

core/fpdfdoc/cpvt_variabletext.cpp

diff --git a/core/fpdfdoc/cpvt_variabletext.cpp b/core/fpdfdoc/cpvt_variabletext.cpp
index 52abdc3..df7408a 100644
--- a/core/fpdfdoc/cpvt_variabletext.cpp
+++ b/core/fpdfdoc/cpvt_variabletext.cpp
@@ -252,11 +252,11 @@
 }
 
 CPVT_WordPlace CPVT_VariableText::DeleteWord(const CPVT_WordPlace& place) {
-  return ClearRightWord(AdjustLineHeader(place, true));
+  return ClearRightWord(PrevLineHeaderPlace(place));
 }
 
 CPVT_WordPlace CPVT_VariableText::BackSpaceWord(const CPVT_WordPlace& place) {
-  return ClearLeftWord(AdjustLineHeader(place, true));
+  return ClearLeftWord(PrevLineHeaderPlace(place));
 }
 
 void CPVT_VariableText::SetText(const WideString& swText) {
@@ -307,7 +307,7 @@
   if (place.nSecIndex >= pdfium::CollectionSize<int32_t>(m_SectionArray))
     place = GetEndWordPlace();
 
-  place = AdjustLineHeader(place, true);
+  place = PrevLineHeaderPlace(place);
   if (pdfium::IndexInBounds(m_SectionArray, place.nSecIndex))
     m_SectionArray[place.nSecIndex]->UpdateWordPlace(place);
 }
@@ -640,7 +640,7 @@
 }
 
 void CPVT_VariableText::ClearSectionRightWords(const CPVT_WordPlace& place) {
-  CPVT_WordPlace wordplace = AdjustLineHeader(place, true);
+  CPVT_WordPlace wordplace = PrevLineHeaderPlace(place);
   if (!pdfium::IndexInBounds(m_SectionArray, place.nSecIndex))
     return;
 
@@ -648,10 +648,17 @@
   pSection->EraseWordsFrom(wordplace.nWordIndex + 1);
 }
 
-CPVT_WordPlace CPVT_VariableText::AdjustLineHeader(const CPVT_WordPlace& place,
-                                                   bool bPrevOrNext) const {
+CPVT_WordPlace CPVT_VariableText::PrevLineHeaderPlace(
+    const CPVT_WordPlace& place) const {
   if (place.nWordIndex < 0 && place.nLineIndex > 0)
-    return bPrevOrNext ? GetPrevWordPlace(place) : GetNextWordPlace(place);
+    return GetPrevWordPlace(place);
+  return place;
+}
+
+CPVT_WordPlace CPVT_VariableText::NextLineHeaderPlace(
+    const CPVT_WordPlace& place) const {
+  if (place.nWordIndex < 0 && place.nLineIndex > 0)
+    return GetNextWordPlace(place);
   return place;
 }
 
@@ -679,7 +686,7 @@
 }
 
 void CPVT_VariableText::LinkLatterSection(const CPVT_WordPlace& place) {
-  CPVT_WordPlace oldplace = AdjustLineHeader(place, true);
+  CPVT_WordPlace oldplace = PrevLineHeaderPlace(place);
   if (!pdfium::IndexInBounds(m_SectionArray, place.nSecIndex + 1))
     return;
 
@@ -696,8 +703,8 @@
 
 void CPVT_VariableText::ClearWords(const CPVT_WordRange& PlaceRange) {
   CPVT_WordRange NewRange;
-  NewRange.BeginPos = AdjustLineHeader(PlaceRange.BeginPos, true);
-  NewRange.EndPos = AdjustLineHeader(PlaceRange.EndPos, true);
+  NewRange.BeginPos = PrevLineHeaderPlace(PlaceRange.BeginPos);
+  NewRange.EndPos = PrevLineHeaderPlace(PlaceRange.EndPos);
   for (int32_t s = NewRange.EndPos.nSecIndex; s >= NewRange.BeginPos.nSecIndex;
        s--) {
     if (pdfium::IndexInBounds(m_SectionArray, s))
@@ -730,7 +737,7 @@
     return place;
 
   CPVT_Section* pSection = m_SectionArray[place.nSecIndex].get();
-  CPVT_WordPlace rightplace = AdjustLineHeader(GetNextWordPlace(place), false);
+  CPVT_WordPlace rightplace = NextLineHeaderPlace(GetNextWordPlace(place));
   if (rightplace == place)
     return place;
 

core/fpdfdoc/cpvt_variabletext.h

diff --git a/core/fpdfdoc/cpvt_variabletext.h b/core/fpdfdoc/cpvt_variabletext.h
index 3d2847e..b3995c9 100644
--- a/core/fpdfdoc/cpvt_variabletext.h
+++ b/core/fpdfdoc/cpvt_variabletext.h
@@ -122,8 +122,8 @@
   CPVT_WordPlace GetSectionBeginPlace(const CPVT_WordPlace& place) const;
   CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const;
   void UpdateWordPlace(CPVT_WordPlace& place) const;
-  CPVT_WordPlace AdjustLineHeader(const CPVT_WordPlace& place,
-                                  bool bPrevOrNext) const;
+  CPVT_WordPlace PrevLineHeaderPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace NextLineHeaderPlace(const CPVT_WordPlace& place) const;
   int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const;
   CPVT_WordPlace WordIndexToWordPlace(int32_t index) const;