PDF Viewer - Search results don't work after rotating pdf

pdf/pdfium/pdfium_engine.cc

 // 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.
 
 #include "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 549 matching lines @@
       doc_(NULL),
       form_(NULL),
       defer_page_unload_(false),
       selecting_(false),
       mouse_down_state_(PDFiumPage::NONSELECTABLE_AREA,
                         PDFiumPage::LinkTarget()),
       next_page_to_search_(-1),
       last_page_to_search_(-1),
       last_character_index_to_search_(-1),
       current_find_index_(-1),
+      resume_find_index_(-1),
       permissions_(0),
       fpdf_availability_(NULL),
       next_timer_id_(0),
       last_page_mouse_down_(-1),
       first_visible_page_(-1),
       most_visible_page_(-1),
       called_do_document_action_(false),
       render_grayscale_(false),
       progressive_paint_timeout_(0),
       getting_password_(false) {
@@ skipping 1096 matching lines @@
       // Only one page but didn't start midway.
       ((pages_.size() == 1 && last_character_index_to_search_ == -1) ||
        // Started midway, but only 1 page and we already looped around.
        (pages_.size() == 1 && !first_search) ||
        // Started midway, and we've just looped around.
        (pages_.size() > 1 && current_page == next_page_to_search_));
 
   if (end_of_search) {
     // Send the final notification.
     client_->NotifyNumberOfFindResultsChanged(find_results_.size(), true);
+
+    // When searching is complete, resume finding at a particular index.
+    if (resume_find_index_ != -1) {
+      current_find_index_ = resume_find_index_;
+      resume_find_index_ = -1;
+    }
   } else {
     pp::CompletionCallback callback =
         find_factory_.NewCallback(&PDFiumEngine::ContinueFind);
     pp::Module::Get()->core()->CallOnMainThread(
         0, callback, case_sensitive ? 1 : 0);
   }
 }
 
 void PDFiumEngine::SearchUsingPDFium(const base::string16& term,
                                      bool case_sensitive,
@@ skipping 75 matching lines @@
   for (i = 0; i < find_results_.size(); ++i) {
     if (find_results_[i].page_index() > page_index ||
         (find_results_[i].page_index() == page_index &&
          find_results_[i].char_index() > char_index)) {
       break;
     }
   }
   find_results_.insert(find_results_.begin() + i, result);
   UpdateTickMarks();
 
-  if (current_find_index_ == -1) {
+  if (current_find_index_ == -1 && resume_find_index_ == -1) {
     // Select the first match.
     SelectFindResult(true);
   } else if (static_cast<int>(i) <= current_find_index_) {
     // Update the current match index
     current_find_index_++;
     client_->NotifySelectedFindResultChanged(current_find_index_);
   }
   client_->NotifyNumberOfFindResultsChanged(find_results_.size(), false);
 }
 
@@ skipping 87 matching lines @@
   CancelPaints();
 
   current_zoom_ = new_zoom_level;
 
   CalculateVisiblePages();
   UpdateTickMarks();
 }
 
 void PDFiumEngine::RotateClockwise() {
   current_rotation_ = (current_rotation_ + 1) % 4;
+
+  // Store the current find index so that we can resume finding at that
+  // particular index after we have recomputed the find results.
+  std::string current_find_text = current_find_text_;
+  resume_find_index_ = current_find_index_;
+
   InvalidateAllPages();
+
+  if (!current_find_text.empty())
+    StartFind(current_find_text.c_str(), false);
 }
 
 void PDFiumEngine::RotateCounterclockwise() {
   current_rotation_ = (current_rotation_ - 1) % 4;
+
+  // Store the current find index so that we can resume finding at that
+  // particular index after we have recomputed the find results.
+  std::string current_find_text = current_find_text_;
+  resume_find_index_ = current_find_index_;
+
   InvalidateAllPages();
+
+  if (!current_find_text.empty())
+    StartFind(current_find_text.c_str(), false);
 }
 
 void PDFiumEngine::InvalidateAllPages() {
-  selection_.clear();
-  find_results_.clear();
-
   CancelPaints();
+  StopFind();
   LoadPageInfo(true);
-  UpdateTickMarks();
   client_->Invalidate(pp::Rect(plugin_size_));
 }
 
 std::string PDFiumEngine::GetSelectedText() {
   base::string16 result;
   for (size_t i = 0; i < selection_.size(); ++i) {
     if (i > 0 &&
         selection_[i - 1].page_index() > selection_[i].page_index()) {
       result = selection_[i].GetText() + result;
     } else {
@@ skipping 1600 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf