Merge WebKit console and load deferrer changes.

webkit/glue/webdevtoolsagent_impl.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_
 #define WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_
 
 #include <string>
 
 #include <wtf/OwnPtr.h>
@@ skipping 49 matching lines @@
 
   // DevToolsRpc::Delegate implementation.
   void SendRpcMessage(const std::string& raw_msg);
 
   // Methods called by the glue.
   void SetMainFrameDocumentReady(bool ready);
   void DidCommitLoadForFrame(WebViewImpl* webview,
                              WebFrame* frame,
                              bool is_new_navigation);
   void AddMessageToConsole(
+      int source,
+      int level,
       const WebCore::String& message,
-      const WebCore::String& source_id,
-      unsigned int line_no);
+      unsigned int line_no,
+      const WebCore::String& source_id);
 
   void ForceRepaint();
 
   int host_id() { return host_id_; }
   NetAgentImpl* net_agent_impl() { return net_agent_impl_.get(); }
 
  private:
   struct ConsoleMessage {
-    ConsoleMessage(const String& m, const String& sid, unsigned li)
-        : message(m),
-          source_id(sid),
-          line_no(li) {
+    ConsoleMessage(
+        int src, int lvl, const String& m, unsigned li, const String& sid)
+        : source(src),
+          level(lvl),
+          text(m),
+          line_no(li),
+          source_id(sid) {
     }
-    WebCore::String message;
+    int source;
+    int level;
+    WebCore::String text;
     WebCore::String source_id;
     unsigned int line_no;
   };
+
+  static void Serialize(const ConsoleMessage& message, DictionaryValue* value);
+
   int host_id_;
   WebDevToolsAgentDelegate* delegate_;
   WebViewImpl* web_view_impl_;
   WebCore::Document* document_;
   OwnPtr<DebuggerAgentDelegateStub> debugger_agent_delegate_stub_;
   OwnPtr<DomAgentDelegateStub> dom_agent_delegate_stub_;
   OwnPtr<NetAgentDelegateStub> net_agent_delegate_stub_;
   OwnPtr<ToolsAgentDelegateStub> tools_agent_delegate_stub_;
   OwnPtr<DebuggerAgentImpl> debugger_agent_impl_;
   OwnPtr<DomAgentImpl> dom_agent_impl_;
   OwnPtr<NetAgentImpl> net_agent_impl_;
   Vector<ConsoleMessage> console_log_;
   bool attached_;
   DISALLOW_COPY_AND_ASSIGN(WebDevToolsAgentImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_