Cleanup some CPDFSDK_PageView annotation code.

fpdfsdk/cba_annotiterator.h

Index: fpdfsdk/cba_annotiterator.h
diff --git a/fpdfsdk/cba_annotiterator.h b/fpdfsdk/cba_annotiterator.h
index a896c862c70346d069f5e20217f5d0f91a448771..2c9c360902a23353c478be41e78653cb4191dfc2 100644
--- a/fpdfsdk/cba_annotiterator.h
+++ b/fpdfsdk/cba_annotiterator.h
@@ -30,9 +30,14 @@ class CBA_AnnotIterator {
   CPDFSDK_Annot* GetPrevAnnot(CPDFSDK_Annot* pAnnot);
 
  private:
-  void GenerateResults();
   static CFX_FloatRect GetAnnotRect(const CPDFSDK_Annot* pAnnot);

[Tom Sepez, 2016/10/05 17:59:52]

nit: I'd just put this in namespace { } in the .cpp file.

[dsinclair, 2016/10/05 18:26:56]

Done.

 
+  void GenerateResults();
+  void CollectAnnots(std::vector<CPDFSDK_Annot*>* pArray);
+  CFX_FloatRect AddToAnnotsList(std::vector<CPDFSDK_Annot*>& sa, size_t idx);

[Tom Sepez, 2016/10/05 17:59:52]

nit: can we pass |sa| as pointer rather than adding a non-const ref argument?

[dsinclair, 2016/10/05 18:26:56]

Done.

+  void AddSelectedToAnnots(std::vector<CPDFSDK_Annot*>& sa,
+                           std::vector<size_t>& aSelect);

[Tom Sepez, 2016/10/05 17:59:52]

nit: ditto with aselect

[dsinclair, 2016/10/05 18:26:56]

Done.

+
   // Function signature compatible with std::sort().
   static bool CompareByLeftAscending(const CPDFSDK_Annot* p1,
                                      const CPDFSDK_Annot* p2);