commit ea90d5dd1f91e6bd6affbf177fba5a9fc9a90497
author Lei Zhang <thestig@chromium.org> Mon Jun 07 19:57:45 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 07 19:57:45 2021 +0000
tree 58dbb3aaad680f331c78e78a794c9b4cc1ba3157
parent 362a124809853480e16268da968c1bb1625a38af

Remove one CPDFSDK_AnnotIterator ctor.

Easily switch users to the other ctor.

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

fpdfsdk/cpdfsdk_annotiterator.cpp

diff --git a/fpdfsdk/cpdfsdk_annotiterator.cpp b/fpdfsdk/cpdfsdk_annotiterator.cpp
index 47444ff..723665f 100644
--- a/fpdfsdk/cpdfsdk_annotiterator.cpp
+++ b/fpdfsdk/cpdfsdk_annotiterator.cpp
@@ -30,12 +30,6 @@
 
 }  // namespace
 
-CPDFSDK_AnnotIterator::CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView,
-                                             CPDF_Annot::Subtype nAnnotSubtype)
-    : CPDFSDK_AnnotIterator(
-          pPageView,
-          std::vector<CPDF_Annot::Subtype>(1, nAnnotSubtype)) {}
-
 CPDFSDK_AnnotIterator::CPDFSDK_AnnotIterator(
     CPDFSDK_PageView* pPageView,
     const std::vector<CPDF_Annot::Subtype>& subtypes_to_iterate)

fpdfsdk/cpdfsdk_annotiterator.h

diff --git a/fpdfsdk/cpdfsdk_annotiterator.h b/fpdfsdk/cpdfsdk_annotiterator.h
index 3fa1941..c99be65 100644
--- a/fpdfsdk/cpdfsdk_annotiterator.h
+++ b/fpdfsdk/cpdfsdk_annotiterator.h
@@ -18,13 +18,9 @@
 
 class CPDFSDK_AnnotIterator {
  public:
-  CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView,
-                        CPDF_Annot::Subtype nAnnotSubtype);
-
   CPDFSDK_AnnotIterator(
       CPDFSDK_PageView* pPageView,
       const std::vector<CPDF_Annot::Subtype>& subtypes_to_iterate);
-
   ~CPDFSDK_AnnotIterator();
 
   CPDFSDK_Annot* GetFirstAnnot();

fpdfsdk/cpdfsdk_annotiterator_embeddertest.cpp

diff --git a/fpdfsdk/cpdfsdk_annotiterator_embeddertest.cpp b/fpdfsdk/cpdfsdk_annotiterator_embeddertest.cpp
index bcb4aab..19bef42 100644
--- a/fpdfsdk/cpdfsdk_annotiterator_embeddertest.cpp
+++ b/fpdfsdk/cpdfsdk_annotiterator_embeddertest.cpp
@@ -45,7 +45,7 @@
   {
     // Page 0 specifies "row order".
     CPDFSDK_AnnotIterator iter(pFormFillEnv->GetPageViewAtIndex(0),
-                               CPDF_Annot::Subtype::WIDGET);
+                               {CPDF_Annot::Subtype::WIDGET});
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -71,7 +71,7 @@
   {
     // Page 1 specifies "column order"
     CPDFSDK_AnnotIterator iter(pFormFillEnv->GetPageViewAtIndex(1),
-                               CPDF_Annot::Subtype::WIDGET);
+                               {CPDF_Annot::Subtype::WIDGET});
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -97,7 +97,7 @@
   {
     // Page 2 specifies "struct order"
     CPDFSDK_AnnotIterator iter(pFormFillEnv->GetPageViewAtIndex(2),
-                               CPDF_Annot::Subtype::WIDGET);
+                               {CPDF_Annot::Subtype::WIDGET});
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), LeftBottom);
     pAnnot = iter.GetNextAnnot(pAnnot);

fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp

diff --git a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
index f5e10b8..f591f74 100644
--- a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
@@ -34,7 +34,7 @@
     m_pFormFillEnv =
         CPDFSDKFormFillEnvironmentFromFPDFFormHandle(form_handle());
     CPDFSDK_AnnotIterator iter(m_pFormFillEnv->GetPageViewAtIndex(0),
-                               CPDF_Annot::Subtype::WIDGET);
+                               {CPDF_Annot::Subtype::WIDGET});
 
     // User editable combobox.
     m_pAnnotEditable = iter.GetFirstAnnot();

fpdfsdk/pwl/cpwl_edit_embeddertest.cpp

diff --git a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
index ac217ce..69762a5 100644
--- a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
@@ -34,7 +34,7 @@
     m_pFormFillEnv =
         CPDFSDKFormFillEnvironmentFromFPDFFormHandle(form_handle());
     CPDFSDK_AnnotIterator iter(m_pFormFillEnv->GetPageViewAtIndex(0),
-                               CPDF_Annot::Subtype::WIDGET);
+                               {CPDF_Annot::Subtype::WIDGET});
     // Normal text field.
     m_pAnnot = iter.GetFirstAnnot();
     ASSERT_TRUE(m_pAnnot);

fpdfsdk/pwl/cpwl_special_button_embeddertest.cpp

diff --git a/fpdfsdk/pwl/cpwl_special_button_embeddertest.cpp b/fpdfsdk/pwl/cpwl_special_button_embeddertest.cpp
index ed2ab15..a5271fc 100644
--- a/fpdfsdk/pwl/cpwl_special_button_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_special_button_embeddertest.cpp
@@ -31,7 +31,7 @@
 
     formfill_env_ = CPDFSDKFormFillEnvironmentFromFPDFFormHandle(form_handle());
     CPDFSDK_AnnotIterator it(formfill_env_->GetPageViewAtIndex(0),
-                             CPDF_Annot::Subtype::WIDGET);
+                             {CPDF_Annot::Subtype::WIDGET});
 
     // Read only check box.
     annot_readonly_checkbox_ = it.GetFirstAnnot();