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

chrome/browser/renderer_host/render_view_host.cc

 // 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.
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/thumbnail_score.h"
 #include "net/base/net_util.h"
 #include "skia/include/SkBitmap.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFindInPageRequest.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h"
 #include "webkit/glue/autofill_form.h"
 
 using base::TimeDelta;
 using WebKit::WebConsoleMessage;
-using WebKit::WebFindInPageRequest;
+using WebKit::WebFindOptions;
 using WebKit::WebInputEvent;
 
 namespace {
 
 void FilterURL(RendererSecurityPolicy* policy, int renderer_id, GURL* url) {
   if (!url->is_valid())
     return;  // We don't need to block invalid URLs.
 
   if (url->SchemeIs(chrome::kAboutScheme)) {
     // The renderer treats all URLs in the about: scheme as being about:blank.
@@ skipping 287 matching lines @@
 
 void RenderViewHost::Stop() {
   Send(new ViewMsg_Stop(routing_id()));
 }
 
 bool RenderViewHost::PrintPages() {
   return Send(new ViewMsg_PrintPages(routing_id()));
 }
 
 void RenderViewHost::StartFinding(int request_id,
-                                  const string16& search_string,
+                                  const string16& search_text,
                                   bool forward,
                                   bool match_case,
                                   bool find_next) {
-  if (search_string.empty())
+  if (search_text.empty())
     return;
 
-  WebFindInPageRequest request;
-  request.identifier = request_id;
-  request.text = search_string;
-  request.forward = forward;
-  request.matchCase = match_case;
-  request.findNext = find_next;
-  Send(new ViewMsg_Find(routing_id(), request));
+  WebFindOptions options;
+  options.forward = forward;
+  options.matchCase = match_case;
+  options.findNext = find_next;
+  Send(new ViewMsg_Find(routing_id(), request_id, search_text, options));
 
   // This call is asynchronous and returns immediately.
   // The result of the search is sent as a notification message by the renderer.
 }
 
 void RenderViewHost::StopFinding(bool clear_selection) {
   Send(new ViewMsg_StopFinding(routing_id(), clear_selection));
 }
 
 void RenderViewHost::Zoom(PageZoom::Function function) {
@@ skipping 54 matching lines @@
     const std::wstring& frame_xpath, const std::wstring& jscript) {
   Send(new ViewMsg_ScriptEvalRequest(routing_id(), frame_xpath, jscript));
 }
 
 void RenderViewHost::InsertCSSInWebFrame(
     const std::wstring& frame_xpath, const std::string& css) {
   Send(new ViewMsg_CSSInsertRequest(routing_id(), frame_xpath, css));
 }
 
 void RenderViewHost::AddMessageToConsole(
-    const std::wstring& frame_xpath, const WebConsoleMessage& message) {
-  Send(new ViewMsg_AddMessageToConsole(routing_id(), frame_xpath, message));
+    const string16& frame_xpath,
+    const string16& message,
+    const WebConsoleMessage::Level& level) {
+  Send(new ViewMsg_AddMessageToConsole(
+      routing_id(), frame_xpath, message, level));
 }
 
 void RenderViewHost::DebugCommand(const std::wstring& cmd) {
   Send(new ViewMsg_DebugCommand(routing_id(), cmd));
 }
 
 void RenderViewHost::DebugAttach() {
   if (!debugger_attached_)
     Send(new ViewMsg_DebugAttach(routing_id()));
 }
@@ skipping 932 matching lines @@
                                         int callback_id) {
   // TODO(aa): Here is where we can check that this renderer was supposed to be
   // able to call extension APIs.
   extension_function_dispatcher_.HandleRequest(name, args, callback_id);
 }
 
 void RenderViewHost::SendExtensionResponse(int callback_id,
                                            const std::string& response) {
   Send(new ViewMsg_ExtensionResponse(routing_id(), callback_id, response));
 }