Stop serializing WebString over IPC. The new rule is that only POD (plain ol...

webkit/glue/webframe.h

 // Copyright (c) 2006-2008 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 WEBKIT_GLUE_WEBFRAME_H_
 #define WEBKIT_GLUE_WEBFRAME_H_
 
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/glue/feed.h"
 
 class WebDataSource;
 class WebError;
 class WebRequest;
 class WebView;
 class WebTextInput;
 struct NPObject;
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace WebKit {
 struct WebConsoleMessage;
-struct WebFindInPageRequest;
+struct WebFindOptions;
 struct WebScriptSource;
 }
 
 // Every frame in a web page is represented by one WebFrame, including the
 // outermost frame.
 class WebFrame {
  public:
   WebFrame() {}
 
   static WebFrame* RetrieveActiveFrame();
@@ skipping 172 matching lines @@
 
   // Searches a frame for a given string.
   //
   // If a match is found, this function will select it (scrolling down to make
   // it visible if needed) and fill in the IntRect (selection_rect) with the
   // location of where the match was found (in screen coordinates).
   //
   // If no match is found, this function clears all tickmarks and highlighting.
   //
   // Returns true if the search string was found, false otherwise.
-  virtual bool Find(const WebKit::WebFindInPageRequest& request,
+  virtual bool Find(int request_id,
+                    const string16& search_text,
+                    const WebKit::WebFindOptions& options,
                     bool wrap_within_frame,
                     gfx::Rect* selection_rect) = 0;
 
   // Notifies the frame that we are no longer interested in searching. This will
   // abort any asynchronous scoping effort already under way (see the function
   // ScopeStringMatches for details) and erase all tick-marks and highlighting
   // from the previous search. If |clear_selection| is true, it will also make
   // sure the end state for the Find operation does not leave a selection.
   // This can occur when the user clears the search string but does not close
   // the find box.
   virtual void StopFinding(bool clear_selection) = 0;
 
   // Counts how many times a particular string occurs within the frame. It
   // also retrieves the location of the string and updates a vector in the frame
   // so that tick-marks and highlighting can be drawn. This function does its
   // work asynchronously, by running for a certain time-slice and then
   // scheduling itself (co-operative multitasking) to be invoked later
   // (repeating the process until all matches have been found). This allows
   // multiple frames to be searched at the same time and provides a way to
   // cancel at any time (see CancelPendingScopingEffort). The parameter Request
   // specifies what to look for and Reset signals whether this is a brand new
   // request or a continuation of the last scoping effort.
-  virtual void ScopeStringMatches(const WebKit::WebFindInPageRequest& request,
+  virtual void ScopeStringMatches(int request_id,
+                                  const string16& search_text,
+                                  const WebKit::WebFindOptions& options,
                                   bool reset) = 0;
 
   // Cancels any outstanding requests for scoping string matches on a frame.
   virtual void CancelPendingScopingEffort() = 0;
 
   // This function is called on the mainframe during the scoping effort to keep
   // a running tally of the accumulated total match-count for all frames. After
   // updating the count it will notify the render-view about the new count.
   virtual void IncreaseMatchCount(int count, int request_id) = 0;
 
@@ skipping 128 matching lines @@
   virtual int PendingFrameUnloadEventCount() const = 0;
 
  protected:
   virtual ~WebFrame() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebFrame);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_H_