PDF: Fix potential bad indexes in find results.

pdf/pdfium/pdfium_engine.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PDF_PDFIUM_PDFIUM_ENGINE_H_
 #define PDF_PDFIUM_PDFIUM_ENGINE_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 133 matching lines @@
     bool Matches(const PDFiumPage::Area& area,
                  const PDFiumPage::LinkTarget& target) const;
 
    private:
     PDFiumPage::Area area_;
     PDFiumPage::LinkTarget target_;
 
     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 {
     DocumentLoader* loader;
   };
 
   struct DownloadHints : public FX_DOWNLOADHINTS {
     DocumentLoader* loader;
   };
 
@@ skipping 220 matching lines @@
                       pp::ImageData* image_data);
 
   void GetRegion(const pp::Point& location,
                  pp::ImageData* image_data,
                  void** region,
                  int* stride) const;
 
   // 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,
                               double left,
                               double top,
                               double right,
                               double bottom);
   static void Form_OutputSelectedRect(FPDF_FORMFILLINFO* param,
                                       FPDF_PAGE page,
                                       double left,
@@ skipping 129 matching lines @@
 
   // Used for searching.
   typedef std::vector<PDFiumRange> FindResults;
   FindResults find_results_;
   // Which page to search next.
   int next_page_to_search_;
   // Where to stop searching.
   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_;
 
   // Interface structure to provide access to document stream.
   FPDF_FILEACCESS file_access_;
   // Interface structure to check data availability in the document stream.
   FileAvail file_availability_;
   // Interface structure to request data chunks from the document stream.
   DownloadHints download_hints_;
@@ skipping 93 matching lines @@
 
   // See the definition of GetPDFPageSizeByIndex in pdf.cc for details.
   virtual bool GetPDFPageSizeByIndex(const void* pdf_buffer,
                                      int pdf_buffer_size, int page_number,
                                      double* width, double* height);
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_PDFIUM_PDFIUM_ENGINE_H_