[Android] Upstream the WebView find-in-page API implementation.

content/renderer/render_view_impl.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 CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 1009 matching lines @@
   void OnSetWindowVisibility(bool visible);
 #endif
   void OnSetZoomLevel(double zoom_level);
   CONTENT_EXPORT void OnSetZoomLevelForLoadingURL(const GURL& url,
                                                   double zoom_level);
   void OnExitFullscreen();
   void OnShouldClose();
   void OnStop();
   void OnStopFinding(content::StopFindAction action);
   CONTENT_EXPORT void OnSwapOut(const ViewMsg_SwapOut_Params& params);
+#if defined(OS_ANDROID)
+  void OnSynchronousFind(int request_id,
+                         const string16& search_string,
+                         const WebKit::WebFindOptions& options,
+                         IPC::Message* reply_msg);
+#endif
   void OnThemeChanged();
   void OnUndo();
   void OnUpdateTargetURLAck();
   CONTENT_EXPORT void OnUpdateWebPreferences(
       const webkit_glue::WebPreferences& prefs);
   CONTENT_EXPORT void OnUnselect();
 
 #if defined(OS_MACOSX)
   void OnWindowFrameChanged(const gfx::Rect& window_frame,
                             const gfx::Rect& view_frame);
@@ skipping 64 matching lines @@
                           const SkBitmap& image);
 
   // Requests to download a favicon image. When done, the RenderView is notified
   // by way of DidDownloadFavicon. Returns true if the request was successfully
   // started, false otherwise. id is used to uniquely identify the request and
   // passed back to the DidDownloadFavicon method. If the image has multiple
   // frames, the frame whose size is image_size is returned. If the image
   // doesn't have a frame at the specified size, the first is returned.
   bool DownloadFavicon(int id, const GURL& image_url, int image_size);
 
+  // Starts a new find-in-page search or looks for the next match.
+  void Find(int request_id, const string16&, const WebKit::WebFindOptions&);

[jam, 2012/09/19 16:55:43]

nit: google style is to always list the parameter names in headers

[Leandro Graciá Gil, 2012/09/19 18:08:59]

Done.

+
   GURL GetAlternateErrorPageURL(const GURL& failed_url,
                                 ErrorPageType error_type);
 
   // Locates a sub frame with given xpath
   WebKit::WebFrame* GetChildFrame(const string16& frame_xpath) const;
 
   // Returns the opener url if present, else an empty url.
   GURL GetOpenerUrl() const;
 
   // Returns the URL being loaded by the given frame's request.
@@ skipping 26 matching lines @@
   void PopulateDocumentStateFromPending(content::DocumentState* document_state);
 
   // Returns a new NavigationState populated with the navigation information
   // saved in OnNavigate().
   content::NavigationState* CreateNavigationStateFromPending();
 
   // Processes the command-line flags --enable-viewport and
   // --enable-fixed-layout[=w,h].
   void ProcessViewLayoutFlags(const CommandLine& command_line);
 
+  // Sends a reply to the current find operation handling if it was a
+  // synchronous find request.
+  void SendFindReply(int request_id,
+                     int match_count,
+                     int ordinal,
+                     const WebKit::WebRect& selection_rect,
+                     bool final_status_update);
+
   // Starts nav_state_sync_timer_ if it isn't already running.
   void StartNavStateSyncTimerIfNecessary();
 
+  // Stops the current find-in-page search.
+  void StopFinding(content::StopFindAction action);
+
   // Dispatches the current navigation state to the browser. Called on a
   // periodic timer so we don't send too many messages.
   void SyncNavigationState();
 
   // Dispatches the current state of selection on the webpage to the browser if
   // it has changed.
   // TODO(varunjain): delete this method once we figure out how to keep
   // selection handles in sync with the webpage.
   void SyncSelectionIfRequired();
 
@@ skipping 227 matching lines @@
   // Android Specific ---------------------------------------------------------
 
   // Expected id of the next content intent launched. Used to prevent scheduled
   // intents to be launched if aborted.
   size_t expected_content_intent_id_;
 
   // List of click-based content detectors.
   typedef std::vector< linked_ptr<content::ContentDetector> >
       ContentDetectorList;
   ContentDetectorList content_detectors_;
+
+  // Holds the message used to return find results to the browser during
+  // synchronous find-in-page requests. Only non-null during these requests.
+  scoped_ptr<IPC::Message> synchronous_find_pending_message_;

[jam, 2012/09/19 16:55:43]

nit: synchronous_find_pending_message_-> synchronous_find_reply_message_ to be
clearer

[Leandro Graciá Gil, 2012/09/19 18:08:59]

Done. Also grouped together the MACOSX messages as done with the message
handlers in render_view_impl.cc.

+
+  // The active find-in-page match ordinal during synchronous requests.
+  // Needed to be remembered across WebKit callbacks.
+  int synchronous_find_active_match_ordinal_;
 #endif
 
   // Misc ----------------------------------------------------------------------
 
   // The current and pending file chooser completion objects. If the queue is
   // nonempty, the first item represents the currently running file chooser
   // callback, and the remaining elements are the other file chooser completion
   // still waiting to be run (in order).
   struct PendingFileChooser;
   std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
@@ skipping 122 matching lines @@
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_