Roll WebKit DEPS from 45738 to 45840.

webkit/glue/webworkerclient_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"
 
 #if ENABLE(WORKERS)
 
 #include "base/compiler_specific.h"
 
@@ skipping 203 matching lines @@
 
   script_execution_context_->reportException(
       webkit_glue::WebStringToString(error_message),
       line_number,
       webkit_glue::WebStringToString(source_url));
 }
 
 void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebString& message,
     int line_number,
     const WebString& source_url) {
   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)));
     return;
   }
 
   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,
       webkit_glue::WebStringToString(source_url));
 }
 
 void WebWorkerClientImpl::confirmMessageFromWorkerObject(
     bool has_pending_activity) {
   // unconfirmed_message_count_ can only be updated on the thread where it's
   // accessed.  Otherwise there are race conditions with v8's garbage
@@ skipping 74 matching lines @@
     const WebCore::String& source_url) {
   this_ptr->script_execution_context_->reportException(
       error_message, line_number, source_url);
 }
 
 void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr,
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebCore::String& message,
     int line_number,
     const WebCore::String& source_url) {
   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,
       source_url);
 }
 
 void WebWorkerClientImpl::ConfirmMessageFromWorkerObjectTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr) {
   this_ptr->unconfirmed_message_count_--;
 }
 
 void WebWorkerClientImpl::ReportPendingActivityTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr,
     bool has_pending_activity) {
   this_ptr->worker_context_had_pending_activity_ = has_pending_activity;
 }
 
 #endif