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

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2113 matching lines @@
       NOTREACHED() << "unknown ErrorPageType";
   }
 
   // OK, build the final url to return.
   GURL::Replacements link_doctor_params;
   link_doctor_params.SetQueryStr(params);
   GURL url = alternate_error_page_url_.ReplaceComponents(link_doctor_params);
   return url;
 }
 
-void RenderView::OnFind(const WebKit::WebFindInPageRequest& request) {
+void RenderView::OnFind(int request_id,
+                        const string16& search_text,
+                        const WebKit::WebFindOptions& options) {
   WebFrame* main_frame = webview()->GetMainFrame();
   WebFrame* frame_after_main = webview()->GetNextFrameAfter(main_frame, true);
   WebFrame* focused_frame = webview()->GetFocusedFrame();
   WebFrame* search_frame = focused_frame;  // start searching focused frame.
 
   bool multi_frame = (frame_after_main != main_frame);
 
   // If we have multiple frames, we don't want to wrap the search within the
   // frame, so we check here if we only have main_frame in the chain.
   bool wrap_within_frame = !multi_frame;
 
   gfx::Rect selection_rect;
   bool result = false;
 
   do {
-    result = search_frame->Find(request, wrap_within_frame, &selection_rect);
+    result = search_frame->Find(
+        request_id, search_text, options, wrap_within_frame, &selection_rect);
 
     if (!result) {
       // don't leave text selected as you move to the next frame.
       search_frame->ClearSelection();
 
       // Find the next frame, but skip the invisible ones.
       do {
         // What is the next frame to search? (we might be going backwards). Note
         // that we specify wrap=true so that search_frame never becomes NULL.
-        search_frame = request.forward ?
+        search_frame = options.forward ?
             webview()->GetNextFrameAfter(search_frame, true) :
             webview()->GetPreviousFrameBefore(search_frame, true);
       } while (!search_frame->Visible() && search_frame != focused_frame);
 
       // Make sure selection doesn't affect the search operation in new frame.
       search_frame->ClearSelection();
 
       // If we have multiple frames and we have wrapped back around to the
       // focused frame, we need to search it once more allowing wrap within
       // the frame, otherwise it will report 'no match' if the focused frame has
       // reported matches, but no frames after the focused_frame contain a
       // match for the search word(s).
       if (multi_frame && search_frame == focused_frame) {
-        result = search_frame->Find(request, true,  // Force wrapping.
-                                    &selection_rect);
+        result = search_frame->Find(
+            request_id, search_text, options, true,  // Force wrapping.
+            &selection_rect);
       }
     }
 
     // TODO(jcampan): http://b/issue?id=1157486 Remove StoreForFocus call once
     //                we have the fix for 792423.
     search_frame->GetView()->StoreFocusForFrame(search_frame);
     webview()->SetFocusedFrame(search_frame);
   } while (!result && search_frame != focused_frame);
 
   // Make sure we don't leave any frame focused or the focus won't be restored
   // properly in WebViewImpl::SetFocus().  Note that we are talking here about
   // focused on the SelectionController, not FocusController.
   // webview()->GetFocusedFrame() will still return the last focused frame (as
   // it queries the FocusController).
   // TODO(jcampan): http://b/issue?id=1157486 Remove next line once we have the
   //                fix for 792423.
   webview()->SetFocusedFrame(NULL);
 
-  if (request.findNext) {
+  if (options.findNext) {
     // Force the main_frame to report the actual count.
-    main_frame->IncreaseMatchCount(0, request.identifier);
+    main_frame->IncreaseMatchCount(0, request_id);
   } else {
     // If nothing is found, set result to "0 of 0", otherwise, set it to
     // "-1 of 1" to indicate that we found at least one item, but we don't know
     // yet what is active.
     int ordinal = result ? -1 : 0;  // -1 here means, we might know more later.
     int match_count = result ? 1 : 0;  // 1 here means possibly more coming.
 
     // If we find no matches then this will be our last status update.
     // Otherwise the scoping effort will send more results.
     bool final_status_update = !result;
 
     // Send the search result over to the browser process.
     Send(new ViewHostMsg_Find_Reply(routing_id_,
-                                    request.identifier,
+                                    request_id,
                                     match_count,
                                     selection_rect,
                                     ordinal,
                                     final_status_update));
 
     // Scoping effort begins, starting with the mainframe.
     search_frame = main_frame;
 
     main_frame->ResetMatchCount();
 
     do {
       // Cancel all old scoping requests before starting a new one.
       search_frame->CancelPendingScopingEffort();
 
       // We don't start another scoping effort unless at least one match has
       // been found.
       if (result) {
         // Start new scoping request. If the scoping function determines that it
         // needs to scope, it will defer until later.
-        search_frame->ScopeStringMatches(request,
+        search_frame->ScopeStringMatches(request_id,
+                                         search_text,
+                                         options,
                                          true);  // reset the tickmarks
       }
 
       // Iterate to the next frame. The frame will not necessarily scope, for
       // example if it is not visible.
       search_frame = webview()->GetNextFrameAfter(search_frame, true);
     } while (search_frame != main_frame);
   }
 }
 
@@ skipping 276 matching lines @@
 void RenderView::OnScriptEvalRequest(const std::wstring& frame_xpath,
                                      const std::wstring& jscript) {
   EvaluateScript(frame_xpath, jscript);
 }
 
 void RenderView::OnCSSInsertRequest(const std::wstring& frame_xpath,
                                     const std::string& css) {
   InsertCSS(frame_xpath, css);
 }
 
-void RenderView::OnAddMessageToConsole(const std::wstring& frame_xpath,
-                                       const WebConsoleMessage& message) {
-  WebFrame* web_frame = GetChildFrame(frame_xpath);
+void RenderView::OnAddMessageToConsole(
+    const string16& frame_xpath,
+    const string16& message,
+    const WebConsoleMessage::Level& level) {
+  WebFrame* web_frame = GetChildFrame(UTF16ToWideHack(frame_xpath));
   if (web_frame)
-    web_frame->AddMessageToConsole(message);
+    web_frame->AddMessageToConsole(WebConsoleMessage(level, message));
 }
 
 #if defined(OS_WIN)
 void RenderView::OnDebugAttach() {
   Send(new ViewHostMsg_DidDebugAttach(routing_id_));
   // Tell the plugin host to stop accepting messages in order to avoid
   // hangs while the renderer is paused.
   // TODO(1243929): It might be an improvement to add more plumbing to do this
   // when the renderer is actually paused vs. just the debugger being attached.
   PluginChannelHost::SetListening(false);
@@ skipping 586 matching lines @@
           "Renderer.Other.StartToFinishDoc", start_to_finish_doc);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.FinishDocToFinish", finish_doc_to_finish);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.RequestToFinish", request_to_finish);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.StartToFinish", start_to_finish);
       break;
   }
 }