Merge WebKit console and load deferrer changes.

webkit/glue/chrome_client_impl.h

 // 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.
 
 #ifndef WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 47 matching lines @@
   virtual bool statusbarVisible();
 
   virtual void setScrollbarsVisible(bool);
   virtual bool scrollbarsVisible();
 
   virtual void setMenubarVisible(bool);
   virtual bool menubarVisible();
 
   virtual void setResizable(bool);
 
-  virtual void addMessageToConsole(const WebCore::String& message,
+  virtual void addMessageToConsole(WebCore::MessageSource source,
+                                   WebCore::MessageLevel level, const WebCore::String& message,
                                    unsigned int lineNumber,
                                    const WebCore::String& sourceID);
 
   virtual bool canRunBeforeUnloadConfirmPanel();
   virtual bool runBeforeUnloadConfirmPanel(const WebCore::String& message,
                                            WebCore::Frame* frame);
 
   virtual void closeWindowSoon();
 
   virtual void runJavaScriptAlert(WebCore::Frame*, const WebCore::String&);
@@ skipping 56 matching lines @@
   bool toolbars_visible_;
   bool statusbar_visible_;
   bool scrollbars_visible_;
   bool menubar_visible_;
   bool resizable_;
   // Set to true if the next SetCursor is to be ignored.
   bool ignore_next_set_cursor_;
 };
 
 #endif  // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_