Cleanup some CPDFSDK_PageView annotation code.

fpdfsdk/cba_annotiterator.h

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_CBA_ANNOTITERATOR_H_
 #define FPDFSDK_CBA_ANNOTITERATOR_H_
 
 #include <vector>
@@ skipping 12 matching lines @@
   CBA_AnnotIterator(CPDFSDK_PageView* pPageView,
                     CPDF_Annot::Subtype nAnnotSubtype);
   ~CBA_AnnotIterator();
 
   CPDFSDK_Annot* GetFirstAnnot();
   CPDFSDK_Annot* GetLastAnnot();
   CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pAnnot);
   CPDFSDK_Annot* GetPrevAnnot(CPDFSDK_Annot* pAnnot);
 
  private:
+  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();
-  static CFX_FloatRect GetAnnotRect(const CPDFSDK_Annot* pAnnot);
+  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);
   static bool CompareByTopDescending(const CPDFSDK_Annot* p1,
                                      const CPDFSDK_Annot* p2);
 
   TabOrder m_eTabOrder;
   CPDFSDK_PageView* m_pPageView;
   CPDF_Annot::Subtype m_nAnnotSubtype;
   std::vector<CPDFSDK_Annot*> m_Annots;
 };
 
 #endif  // FPDFSDK_CBA_ANNOTITERATOR_H_