Merge WebKit console and load deferrer changes.

webkit/glue/webdevtoolsagent_impl.cc

 // Copyright (c) 2009 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 "config.h"
 
 #include <string>
 
 #include "Document.h"
 #include "EventListener.h"
@@ skipping 63 matching lines @@
   Document* doc = page->mainFrame()->document();
   if (doc) {
     debugger_agent_impl_->SetDocument(doc);
     dom_agent_impl_->SetDocument(doc);
     net_agent_impl_->SetDocument(doc);
   }
 
   // Populate console.
   for (Vector<ConsoleMessage>::iterator it = console_log_.begin();
        it != console_log_.end(); ++it) {
-    tools_agent_delegate_stub_->AddMessageToConsole(
-        it->message,
-        it->source_id,
-        it->line_no);
+    DictionaryValue message;
+    Serialize(*it, &message);
+    tools_agent_delegate_stub_->AddMessageToConsole(message);
   }
 
   net_agent_impl_->Attach();
   attached_ = true;
 }
 
 void WebDevToolsAgentImpl::Detach() {
   debugger_agent_impl_.set(NULL);
   dom_agent_impl_.set(NULL);
   net_agent_impl_->Detach();
@@ skipping 32 matching lines @@
   const WebRequest& request = ds->GetRequest();
   GURL url = ds->HasUnreachableURL() ?
       ds->GetUnreachableURL() :
       request.GetURL();
   tools_agent_delegate_stub_->FrameNavigate(
       url.possibly_invalid_spec(),
       webview->GetMainFrame() == frame);
 }
 
 void WebDevToolsAgentImpl::AddMessageToConsole(
-    const String& message,
-    const String& source_id,
-    unsigned int line_no) {
-  ConsoleMessage cm(message, source_id, line_no);
+    int source,
+    int level,
+    const String& text,
+    unsigned int line_no,
+    const String& source_id) {
+  ConsoleMessage cm(source, level, text, line_no, source_id);
   console_log_.append(cm);
   if (console_log_.size() >= kMaxConsoleMessages) {
     // Batch shifts to save ticks.
     console_log_.remove(0, kMaxConsoleMessages / 5);
   }
   if (attached_) {
-    tools_agent_delegate_stub_->AddMessageToConsole(
-        message,
-        source_id,
-        line_no);
+    DictionaryValue message;
+    Serialize(cm, &message);
+    tools_agent_delegate_stub_->AddMessageToConsole(message);
   }
 }
 
 void WebDevToolsAgentImpl::ForceRepaint() {
   delegate_->ForceRepaint();
 }
 
 void WebDevToolsAgentImpl::HighlightDOMNode(int node_id) {
   if (!attached_) {
     return;
@@ skipping 78 matching lines @@
 
   int node_id = dom_agent_impl_->PushNodePathToClient(node);
   tools_agent_delegate_stub_->UpdateFocusedNode(node_id);
 }
 
 void WebDevToolsAgentImpl::SendRpcMessage(const std::string& raw_msg) {
   delegate_->SendMessageToClient(raw_msg);
 }
 
 // static
+void WebDevToolsAgentImpl::Serialize(const ConsoleMessage& message,
+                                     DictionaryValue* value) {
+  value->SetInteger(L"source", message.source);
+  value->SetInteger(L"level", message.level);
+  value->SetString(L"text", webkit_glue::StringToStdString(message.text));
+  value->SetString(L"sourceId",
+      webkit_glue::StringToStdString(message.source_id));
+  value->SetInteger(L"line", message.line_no);
+}
+
+// static
 void WebDevToolsAgent::ExecuteDebuggerCommand(
     const std::string& command,
     int caller_id) {
   DebuggerAgentManager::ExecuteDebuggerCommand(command, caller_id);
 }
 
 // static
 void WebDevToolsAgent::SetMessageLoopDispatchHandler(
     MessageLoopDispatchHandler handler) {
   DebuggerAgentManager::SetMessageLoopDispatchHandler(handler);
 }
+