Merge WebKit console and load deferrer changes.

webkit/glue/chrome_client_impl.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 "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
+#include "Console.h"
 #include "Cursor.h"
 #include "FloatRect.h"
 #include "FileChooser.h"
 #include "FrameLoadRequest.h"
 #include "FrameView.h"
 #include "HitTestResult.h"
 #include "IntRect.h"
 #include "Page.h"
 #include "PopupMenuChromium.h"
 #include "ScriptController.h"
@@ skipping 245 matching lines @@
 }
 
 bool ChromeClientImpl::menubarVisible() {
   return menubar_visible_;
 }
 
 void ChromeClientImpl::setResizable(bool value) {
   resizable_ = value;
 }
 
-void ChromeClientImpl::addMessageToConsole(const WebCore::String& message,
+void ChromeClientImpl::addMessageToConsole(WebCore::MessageSource source,
+                                           WebCore::MessageLevel level,
+                                           const WebCore::String& message,
                                            unsigned int line_no,
                                            const WebCore::String& source_id) {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate) {
     std::wstring wstr_message = webkit_glue::StringToStdWString(message);
     std::wstring wstr_source_id = webkit_glue::StringToStdWString(source_id);
     delegate->AddMessageToConsole(webview_, wstr_message,
                                   line_no, wstr_source_id);
   }
   WebDevToolsAgentImpl* devtools_agent = webview_->GetWebDevToolsAgentImpl();
   if (devtools_agent) {
-    devtools_agent->AddMessageToConsole(message, source_id, line_no);
+    devtools_agent->AddMessageToConsole(source, level, message, line_no, source_id);
   }
 }
 
 bool ChromeClientImpl::canRunBeforeUnloadConfirmPanel() {
   return webview_->delegate() != NULL;
 }
 
 bool ChromeClientImpl::runBeforeUnloadConfirmPanel(
     const WebCore::String& message,
     WebCore::Frame* frame) {
@@ skipping 287 matching lines @@
   // EventHandler.cpp and since we don't want that we set a flag indicating
   // that the next SetCursor call is to be ignored.
   ignore_next_set_cursor_ = true;
 }
 
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->OnNavStateChanged(webview_);
 }