Enable find-in-page across GuestViews.

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 2059 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.
-    // Assuming the user has not clicked the find button in the meanwhile.
-    if (resume_find_index_.valid() && !current_find_index_.valid()) {
-      size_t resume_index = resume_find_index_.GetIndex();
-      if (resume_index >= find_results_.size()) {
-        // This might happen if the PDF has some dynamically generated text?
-        resume_index = 0;
-      }
-      current_find_index_.SetIndex(resume_index);
-      client_->NotifySelectedFindResultChanged(resume_index);
-    }
-    resume_find_index_.Invalidate();
   } 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 88 matching lines @@
   int char_index = result.char_index();
   for (result_index = 0; result_index < find_results_.size(); ++result_index) {
     if (find_results_[result_index].page_index() > page_index ||
         (find_results_[result_index].page_index() == page_index &&
          find_results_[result_index].char_index() > char_index)) {
       break;
     }
   }
   find_results_.insert(find_results_.begin() + result_index, result);
   UpdateTickMarks();
-
-  if (current_find_index_.valid()) {
-    if (result_index <= current_find_index_.GetIndex()) {
-      // Update the current match index
-      size_t find_index = current_find_index_.IncrementIndex();
-      DCHECK_LT(find_index, find_results_.size());
-      client_->NotifySelectedFindResultChanged(current_find_index_.GetIndex());
-    }
-  } else if (!resume_find_index_.valid()) {
-    // Both indices are invalid. Select the first match.
-    SelectFindResult(true);
-  }
   client_->NotifyNumberOfFindResultsChanged(find_results_.size(), false);
 }
 
 bool PDFiumEngine::SelectFindResult(bool forward) {
   if (find_results_.empty()) {
     NOTREACHED();
     return false;
   }
 
   SelectionChangeInvalidator selection_invalidator(this);
 
   // Move back/forward through the search locations we previously found.
   size_t new_index;
   const size_t last_index = find_results_.size() - 1;
-  if (current_find_index_.valid()) {
+
+  if (resume_find_index_.valid()) {
+    new_index = resume_find_index_.GetIndex();
+    resume_find_index_.Invalidate();
+  } else if (current_find_index_.valid()) {
     size_t current_index = current_find_index_.GetIndex();
     if (forward) {
+      if (current_index >= last_index) {

[Lei Zhang, 2017/04/24 21:11:12]

It feels like if we have to special-case going forward, then we may need to do
the same for going backwards?

[paulmeyer, 2017/04/24 21:44:22]

Whoops, you're very right. I had meant to put that in but missed it.

+        current_find_index_.Invalidate();
+        client_->NotifySelectedFindResultChanged(-1);
+        client_->NotifyNumberOfFindResultsChanged(find_results_.size(), true);
+        return true;
+      }
       new_index = (current_index >= last_index) ? 0 : current_index + 1;

[Lei Zhang, 2017/04/24 21:11:12]

This always evals to: new_index = current_index + 1;

[paulmeyer, 2017/04/24 21:44:22]

Done.

     } else {
       new_index = (current_find_index_.GetIndex() == 0) ? last_index
                                                         : current_index - 1;
     }
   } else {
     new_index = forward ? 0 : last_index;
   }
   current_find_index_.SetIndex(new_index);
 
   // Update the selection before telling the client to scroll, since it could
@@ skipping 1888 matching lines @@
   FPDF_DOCUMENT doc =
       FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, nullptr);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf