Roll WebKit DEPS from 45738 to 45840.

Review URL: http://codereview.chromium.org/149575

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20589 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 18 insertions, 3 deletions

diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 53aca2e..d868767 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -312,6 +312,7 @@ void ChromeClientImpl::setResizable(bool value) {
 }
 
 void ChromeClientImpl::addMessageToConsole(WebCore::MessageSource source,
+                                           WebCore::MessageType type,
                                            WebCore::MessageLevel level,
                                            const WebCore::String& message,
                                            unsigned int line_no,
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 03478cd..cebffc2 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -70,6 +70,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
   virtual void setResizable(bool);
 
   virtual void addMessageToConsole(WebCore::MessageSource source,
+                                   WebCore::MessageType type,
                                    WebCore::MessageLevel level,
                                    const WebCore::String& message,
                                    unsigned int lineNumber,
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 73ae01bc..f74dd2c 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1708,8 +1708,9 @@ void WebFrameImpl::AddMessageToConsole(const WebConsoleMessage& message) {
   }
 
   frame()->domWindow()->console()->addMessage(
-      WebCore::OtherMessageSource, webcore_message_level,
-      webkit_glue::WebStringToString(message.text), 1, String());
+      WebCore::OtherMessageSource, WebCore::LogMessageType,
+      webcore_message_level, webkit_glue::WebStringToString(message.text),
+      1, String());
 }
 
 void WebFrameImpl::ClosePage() {
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index e42dbfe..4016e85 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -277,6 +277,7 @@ void WebWorkerImpl::PostExceptionTask(
 void WebWorkerImpl::postConsoleMessageToWorkerObject(
     WebCore::MessageDestination destination,
     WebCore::MessageSource source,
+    WebCore::MessageType type,
     WebCore::MessageLevel level,
     const WebCore::String& message,
     int line_number,
@@ -286,6 +287,7 @@ void WebWorkerImpl::postConsoleMessageToWorkerObject(
       this,
       static_cast<int>(destination),
       static_cast<int>(source),
+      static_cast<int>(type),
       static_cast<int>(level),
       message,
       line_number,
@@ -297,6 +299,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
     WebWorkerImpl* this_ptr,
     int destination,
     int source,
+    int type,
     int level,
     const WebCore::String& message,
     int line_number,
@@ -304,6 +307,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
   this_ptr->client_->postConsoleMessageToWorkerObject(
       destination,
       source,
+      type,
       level,
       webkit_glue::StringToWebString(message),
       line_number,
diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h
index f7daf42..0a1a3db 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -45,6 +45,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
   virtual void postConsoleMessageToWorkerObject(
       WebCore::MessageDestination destination,
       WebCore::MessageSource source,
+      WebCore::MessageType type,
       WebCore::MessageLevel level,
       const WebCore::String& message,
       int line_number,
@@ -104,6 +105,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
       WebWorkerImpl* this_ptr,
       int destination,
       int source,
+      int type,
       int level,
       const WebCore::String& message,
       int line_number,
diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index d915ca7..22b7c17 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -221,6 +221,7 @@ void WebWorkerClientImpl::postExceptionToWorkerObject(
 void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebString& message,
     int line_number,
@@ -228,7 +229,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
   if (WTF::currentThread() != worker_thread_id_) {
     script_execution_context_->postTask(
         WebCore::createCallbackTask(&PostConsoleMessageToWorkerObjectTask, this,
-            destination_id, source_id, message_level,
+            destination_id, source_id, message_type, message_level,
             webkit_glue::WebStringToString(message),
             line_number,
             webkit_glue::WebStringToString(source_url)));
@@ -238,6 +239,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
   script_execution_context_->addMessage(
       static_cast<WebCore::MessageDestination>(destination_id),
       static_cast<WebCore::MessageSource>(source_id),
+      static_cast<WebCore::MessageType>(message_type),
       static_cast<WebCore::MessageLevel>(message_level),
       webkit_glue::WebStringToString(message),
       line_number,
@@ -332,6 +334,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
     WebWorkerClientImpl* this_ptr,
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebCore::String& message,
     int line_number,
@@ -339,6 +342,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
   this_ptr->script_execution_context_->addMessage(
       static_cast<WebCore::MessageDestination>(destination_id),
       static_cast<WebCore::MessageSource>(source_id),
+      static_cast<WebCore::MessageType>(message_type),
       static_cast<WebCore::MessageLevel>(message_level),
       message,
       line_number,
diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h
index b5f1aac..18422cf 100644
--- a/webkit/glue/webworkerclient_impl.h
+++ b/webkit/glue/webworkerclient_impl.h
@@ -56,6 +56,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
   virtual void postConsoleMessageToWorkerObject(
       int destination_id,
       int source_id,
+      int message_type,
       int message_level,
       const WebKit::WebString& message,
       int line_number,
@@ -110,6 +111,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
       WebWorkerClientImpl* this_ptr,
       int destination_id,
       int source_id,
+      int message_type,
       int message_level,
       const WebCore::String& message,
       int line_number,