PDF: Fix potential bad indexes in find results.

pdf/pdfium/pdfium_engine.h

Index: pdf/pdfium/pdfium_engine.h
diff --git a/pdf/pdfium/pdfium_engine.h b/pdf/pdfium/pdfium_engine.h
index cb3d0f4030e8f0aa2cd497dfe4bb10f4559f4d57..9d5d6cbdad1f2c8f640b513b7fd37126813da8c0 100644
--- a/pdf/pdfium/pdfium_engine.h
+++ b/pdf/pdfium/pdfium_engine.h
@@ -151,6 +151,26 @@ class PDFiumEngine : public PDFEngine,
     DISALLOW_COPY_AND_ASSIGN(MouseDownState);
   };
 
+  // Used to store the state of a text search.
+  class FindTextData {

[raymes, 2014/11/03 05:17:31]

Since this seems like an abstraction over the index, should we call it
FindTextIndex (or just FindIndex)?

[Lei Zhang, 2014/11/03 23:25:42]

FindTextIndex it is.

+   public:
+    FindTextData();
+    ~FindTextData();
+
+    bool valid() const { return valid_; }
+    void Invalidate();
+
+    size_t GetIndex() const;
+    void SetIndex(size_t index);
+    size_t IncrementIndex();
+
+   private:
+    bool valid_;  // Whether |index_| is valid or not.
+    size_t index_;  // The current search result, 0-based.
+
+    DISALLOW_COPY_AND_ASSIGN(FindTextData);
+  };
+
   friend class SelectionChangeInvalidator;
 
   struct FileAvail : public FX_FILEAVAIL {
@@ -391,6 +411,9 @@ class PDFiumEngine : public PDFEngine,
   // Called when the selection changes.
   void OnSelectionChanged();
 
+  // Common code shared by RotateClockwise() and RotateCounterclockwise().
+  void RotateInternal();
+
   // FPDF_FORMFILLINFO callbacks.
   static void Form_Invalidate(FPDF_FORMFILLINFO* param,
                               FPDF_PAGE page,
@@ -540,9 +563,9 @@ class PDFiumEngine : public PDFEngine,
   int last_page_to_search_;
   int last_character_index_to_search_;  // -1 if search until end of page.
   // Which result the user has currently selected.
-  int current_find_index_;
+  FindTextData current_find_index_;
   // Where to resume searching.
-  int resume_find_index_;
+  FindTextData resume_find_index_;
 
   // Permissions bitfield.
   unsigned long permissions_;