Remove some dead code.

- No caller checks the CPDF_VariableText::SetProvider() return value.
- IFX_Edit::SetVTProvider() is unused.
- CFX_ListItem::SetCaret() is useless.
- CFX_List::SetItemCaret() is also useless.
- CPVT_GenerateAP::GenerateEditAP() has a param that's always NULL.

Review-Url: https://codereview.chromium.org/1960183003

5 files changed, 7 insertions, 41 deletions

diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index f2ff300452..a02a2a0278 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -791,10 +791,6 @@ void CFX_Edit::SetFontMap(IPVT_FontMap* pFontMap) {
   m_pVT->SetProvider(m_pVTProvide = new CFX_Edit_Provider(pFontMap));
 }
 
-void CFX_Edit::SetVTProvider(CPDF_VariableText::Provider* pProvider) {
-  m_pVT->SetProvider(pProvider);
-}
-
 void CFX_Edit::SetNotify(IFX_Edit_Notify* pNotify) {
   m_pNotify = pNotify;
 }
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp
index af6e8588f6..63465ebe44 100644
--- a/fpdfsdk/fxedit/fxet_list.cpp
+++ b/fpdfsdk/fxedit/fxet_list.cpp
@@ -12,7 +12,6 @@
 CFX_ListItem::CFX_ListItem()
     : m_pEdit(NULL),
       m_bSelected(FALSE),
-      m_bCaret(FALSE),
       m_rcListItem(0.0f, 0.0f, 0.0f, 0.0f) {
   m_pEdit = IFX_Edit::NewEdit();
   m_pEdit->SetAlignmentV(1);
@@ -55,14 +54,6 @@ void CFX_ListItem::SetSelect(FX_BOOL bSelected) {
   m_bSelected = bSelected;
 }
 
-FX_BOOL CFX_ListItem::IsCaret() const {
-  return m_bCaret;
-}
-
-void CFX_ListItem::SetCaret(FX_BOOL bCaret) {
-  m_bCaret = bCaret;
-}
-
 void CFX_ListItem::SetText(const FX_WCHAR* text) {
   if (m_pEdit)
     m_pEdit->SetText(text);
@@ -257,17 +248,15 @@ CFX_FloatRect CFX_List::GetItemRect(int32_t nIndex) const {
     CFX_FloatRect rcItem = pListItem->GetRect();
     rcItem.left = 0.0f;
     rcItem.right = GetPlateRect().Width();
-    return InnerToOuter(rcItem);
+    return InnerToOuter(CLST_Rect(rcItem));
   }
 
   return CFX_FloatRect();
 }
 
 FX_BOOL CFX_List::IsItemSelected(int32_t nIndex) const {
-  if (CFX_ListItem* pListItem = m_aListItems.GetAt(nIndex)) {
+  if (CFX_ListItem* pListItem = m_aListItems.GetAt(nIndex))
     return pListItem->IsSelected();
-  }
-
   return FALSE;
 }
 
@@ -277,12 +266,6 @@ void CFX_List::SetItemSelect(int32_t nItemIndex, FX_BOOL bSelected) {
   }
 }
 
-void CFX_List::SetItemCaret(int32_t nItemIndex, FX_BOOL bCaret) {
-  if (CFX_ListItem* pListItem = m_aListItems.GetAt(nItemIndex)) {
-    pListItem->SetCaret(bCaret);
-  }
-}
-
 void CFX_List::SetMultipleSel(FX_BOOL bMultiple) {
   m_bMultiple = bMultiple;
 }
@@ -639,10 +622,6 @@ void CFX_ListCtrl::SetCaret(int32_t nItemIndex) {
 
     if (nOldIndex != nItemIndex) {
       m_nCaretIndex = nItemIndex;
-
-      SetItemCaret(nOldIndex, FALSE);
-      SetItemCaret(nItemIndex, TRUE);
-
       InvalidateItem(nOldIndex);
       InvalidateItem(nItemIndex);
     }
diff --git a/fpdfsdk/fxedit/include/fx_edit.h b/fpdfsdk/fxedit/include/fx_edit.h
index a00d1d41a7..5f0283f06f 100644
--- a/fpdfsdk/fxedit/include/fx_edit.h
+++ b/fpdfsdk/fxedit/include/fx_edit.h
@@ -169,10 +169,6 @@ class IFX_Edit {
   // set a IPVT_FontMap pointer implemented by user.
   virtual void SetFontMap(IPVT_FontMap* pFontMap) = 0;
 
-  // if user don't like to use FontMap, implement VTProvider and set it
-  // directly.
-  virtual void SetVTProvider(CPDF_VariableText::Provider* pProvider) = 0;
-
   // set a IFX_Edit_Notify pointer implemented by user.
   virtual void SetNotify(IFX_Edit_Notify* pNotify) = 0;
   virtual void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) = 0;
diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h
index 4233b1d301..738210a997 100644
--- a/fpdfsdk/fxedit/include/fxet_edit.h
+++ b/fpdfsdk/fxedit/include/fxet_edit.h
@@ -516,7 +516,6 @@ class CFX_Edit : public IFX_Edit {
 
   // IFX_Edit
   void SetFontMap(IPVT_FontMap* pFontMap) override;
-  void SetVTProvider(CPDF_VariableText::Provider* pProvider) override;
   void SetNotify(IFX_Edit_Notify* pNotify) override;
   void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
   IFX_Edit_Iterator* GetIterator() override;
diff --git a/fpdfsdk/fxedit/include/fxet_list.h b/fpdfsdk/fxedit/include/fxet_list.h
index 1f855b7747..58aa94c5b6 100644
--- a/fpdfsdk/fxedit/include/fxet_list.h
+++ b/fpdfsdk/fxedit/include/fxet_list.h
@@ -46,7 +46,7 @@ class CLST_Rect : public CFX_FloatRect {
     bottom = other_bottom;
   }
 
-  CLST_Rect(const CFX_FloatRect& rect) {
+  explicit CLST_Rect(const CFX_FloatRect& rect) {
     left = rect.left;
     top = rect.top;
     right = rect.right;
@@ -113,33 +113,30 @@ class CLST_Rect : public CFX_FloatRect {
   }
 };
 
-class CFX_ListItem {
+class CFX_ListItem final {
  public:
   CFX_ListItem();
-  virtual ~CFX_ListItem();
+  ~CFX_ListItem();
 
   void SetFontMap(IPVT_FontMap* pFontMap);
-  IFX_Edit_Iterator* GetIterator() const;
   IFX_Edit* GetEdit() const;
 
- public:
   void SetRect(const CLST_Rect& rect);
   void SetSelect(FX_BOOL bSelected);
-  void SetCaret(FX_BOOL bCaret);
   void SetText(const FX_WCHAR* text);
   void SetFontSize(FX_FLOAT fFontSize);
   CFX_WideString GetText() const;
 
   CLST_Rect GetRect() const;
   FX_BOOL IsSelected() const;
-  FX_BOOL IsCaret() const;
   FX_FLOAT GetItemHeight() const;
   uint16_t GetFirstChar() const;
 
  private:
+  IFX_Edit_Iterator* GetIterator() const;
+
   IFX_Edit* m_pEdit;
   FX_BOOL m_bSelected;
-  FX_BOOL m_bCaret;
   CLST_Rect m_rcListItem;
 };
 
@@ -233,7 +230,6 @@ class CFX_List : protected CFX_ListContainer, public IFX_List {
   virtual void ReArrange(int32_t nItemIndex);
   CFX_WideString GetItemText(int32_t nIndex) const;
   void SetItemSelect(int32_t nItemIndex, FX_BOOL bSelected);
-  void SetItemCaret(int32_t nItemIndex, FX_BOOL bCaret);
   int32_t GetLastSelected() const;
   FX_WCHAR Toupper(FX_WCHAR c) const;