commit 951f4f8bd9698efde1bf11bab19aece8f7247613
author Lei Zhang <thestig@chromium.org> Tue Apr 06 16:52:26 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 06 16:52:26 2021 +0000
tree 96c96bf0efa5913f2ca27123012d8215bf221341
parent c524b1f09e9c1dd67a0b5b8f0731993dd86043d2

Remove CPWL_ListCtrl::SetContentRect().

Inline this public setter into the one CPWL_ListCtrl method that calls
it. Do the same for CPDF_VariableText::SetContentRect(), and also remove
an unneeded call to the CPVT_FloatRect ctor.

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

core/fpdfdoc/cpdf_variabletext.cpp

diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index 7e87e5c..8ca72fc 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -576,12 +576,8 @@
   m_rcPlate = rect;
 }
 
-void CPDF_VariableText::SetContentRect(const CPVT_FloatRect& rect) {
-  m_rcContent = rect;
-}
-
 CFX_FloatRect CPDF_VariableText::GetContentRect() const {
-  return InToOut(CPVT_FloatRect(m_rcContent));
+  return InToOut(m_rcContent);
 }
 
 const CFX_FloatRect& CPDF_VariableText::GetPlateRect() const {
@@ -783,7 +779,7 @@
       rcRet = RearrangeSections(PlaceRange);
     }
   }
-  SetContentRect(rcRet);
+  m_rcContent = rcRet;
   return rcRet;
 }
 

core/fpdfdoc/cpdf_variabletext.h

diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h
index 1d3fb59..6e371ec 100644
--- a/core/fpdfdoc/cpdf_variabletext.h
+++ b/core/fpdfdoc/cpdf_variabletext.h
@@ -72,7 +72,6 @@
   void SetProvider(CPDF_VariableText::Provider* pProvider);
   CPDF_VariableText::Iterator* GetIterator();
 
-  void SetContentRect(const CPVT_FloatRect& rect);
   CFX_FloatRect GetContentRect() const;
   void SetPlateRect(const CFX_FloatRect& rect);
   const CFX_FloatRect& GetPlateRect() const;

fpdfsdk/pwl/cpwl_list_ctrl.cpp

diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.cpp b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
index 9d17299..6dcfeef 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
@@ -498,7 +498,7 @@
         CFX_FloatRect(0.0f, fPosY + fListItemHeight, 0.0f, fPosY));
     fPosY += fListItemHeight;
   }
-  SetContentRect(CFX_FloatRect(0.0f, fPosY, 0.0f, 0.0f));
+  m_rcContent = CFX_FloatRect(0.0f, fPosY, 0.0f, 0.0f);
   SetScrollInfo();
 }
 

fpdfsdk/pwl/cpwl_list_ctrl.h

diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.h b/fpdfsdk/pwl/cpwl_list_ctrl.h
index 3a5784e..72d40a6 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.h
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.h
@@ -55,7 +55,6 @@
   int32_t GetCaret() const { return m_nCaretIndex; }
   int32_t GetSelect() const { return m_nSelItem; }
   int32_t GetTopItem() const;
-  void SetContentRect(const CFX_FloatRect& rect) { m_rcContent = rect; }
   CFX_FloatRect GetContentRect() const;
 
   int32_t GetItemIndex(const CFX_PointF& point) const;