WebKit update 48700:48721....

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"
 
 #include "DedicatedWorkerThread.h"
+#include "ErrorEvent.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
 #include "GenericWorkerTask.h"
+#include "MessageEvent.h"
 #include "MessagePort.h"
 #include "MessagePortChannel.h"
 #include "ScriptExecutionContext.h"
+#include "Worker.h"
+#include "WorkerContext.h"
 #include "WorkerContextExecutionProxy.h"
 #include "WorkerMessagingProxy.h"
-#include "Worker.h"
-#include "WorkerContext.h"
 #include <wtf/Threading.h>
 
 #undef LOG
 
 #include "webkit/glue/webworkerclient_impl.h"
 
 #include "base/command_line.h"
 #include "webkit/api/public/WebFrameClient.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebKitClient.h"
@@ skipping 198 matching lines @@
   if (WTF::currentThread() != worker_thread_id_) {
     script_execution_context_->postTask(
         WebCore::createCallbackTask(&PostExceptionToWorkerObjectTask, this,
             webkit_glue::WebStringToString(error_message),
             line_number,
             webkit_glue::WebStringToString(source_url)));
     return;
   }
 
   bool handled = false;
-  handled = worker_->dispatchScriptErrorEvent(
-      webkit_glue::WebStringToString(error_message),
-      webkit_glue::WebStringToString(source_url),
-      line_number);
+  handled = worker_->dispatchEvent(
+      WebCore::ErrorEvent::create(webkit_glue::WebStringToString(error_message),
+                                  webkit_glue::WebStringToString(source_url),
+                                  line_number));
   if (!handled)
     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,
@@ skipping 86 matching lines @@
 
 void WebWorkerClientImpl::PostMessageToWorkerObjectTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr,
     const WebCore::String& message,
     WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
 
   if (this_ptr->worker_) {
     WTF::OwnPtr<WebCore::MessagePortArray> ports =
         WebCore::MessagePort::entanglePorts(*context, channels.release());
-    this_ptr->worker_->dispatchMessage(message, ports.release());
+    this_ptr->worker_->dispatchEvent(
+        WebCore::MessageEvent::create(ports.release(), message));
   }
 }
 
 void WebWorkerClientImpl::PostExceptionToWorkerObjectTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr,
     const WebCore::String& error_message,
     int line_number,
     const WebCore::String& source_url) {
   bool handled = false;
   if (this_ptr->worker_)
-    handled = this_ptr->worker_->dispatchScriptErrorEvent(
-        error_message, source_url, line_number);
+    handled = this_ptr->worker_->dispatchEvent(
+        WebCore::ErrorEvent::create(error_message, source_url, line_number));
   if (!handled)
     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,
@@ skipping 19 matching lines @@
 }
 
 void WebWorkerClientImpl::ReportPendingActivityTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerClientImpl* this_ptr,
     bool has_pending_activity) {
   this_ptr->worker_context_had_pending_activity_ = has_pending_activity;
 }
 
 #endif