commit 8afe15a019c78a24168ebc42306342c25358ccdf
author dsinclair <dsinclair@chromium.org> Wed Oct 05 12:00:34 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 05 12:00:34 2016 -0700
tree 09012697e63b0a1fa4654f6e6f93b69a04421171
parent 7c1b07fde27dfbbf1d979d9dfd616b1a42591e5f

Cleanup some CPDFSDK_PageView annotation code.

This Cl cleans up the code regarding CPDFSDK_Annots in CPDFSDK_PageView.
This includes:
  * Makes DeleteAnnot XFA only and wraps at the call site.
  * Removes unused methods
  * Replaces use of CountAnnots and GetAnnot with vector iteration
  * Removes {Set|Kill}FocusAnnot from CPDFSDK_PageView
  * Renames m_fxAnnotArray to m_SDKAnnotArray

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

fpdfsdk/cba_annotiterator.h

diff --git a/fpdfsdk/cba_annotiterator.h b/fpdfsdk/cba_annotiterator.h
index a896c86..5cbe8e3 100644
--- a/fpdfsdk/cba_annotiterator.h
+++ b/fpdfsdk/cba_annotiterator.h
@@ -31,13 +31,10 @@
 
  private:
   void GenerateResults();
-  static CFX_FloatRect GetAnnotRect(const CPDFSDK_Annot* pAnnot);
-
-  // 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);
+  void CollectAnnots(std::vector<CPDFSDK_Annot*>* pArray);
+  CFX_FloatRect AddToAnnotsList(std::vector<CPDFSDK_Annot*>* sa, size_t idx);
+  void AddSelectedToAnnots(std::vector<CPDFSDK_Annot*>* sa,
+                           std::vector<size_t>* aSelect);
 
   TabOrder m_eTabOrder;
   CPDFSDK_PageView* m_pPageView;