Webkit roll: 49213:49221

webkit/glue/webworker_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"
 
 #include "base/compiler_specific.h"
 
 #include "DedicatedWorkerContext.h"
 #include "DedicatedWorkerThread.h"
 #include "GenericWorkerTask.h"
 #include "KURL.h"
 #include "MessageEvent.h"
 #include "MessagePort.h"
 #include "MessagePortChannel.h"
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
+#include "SerializedScriptValue.h"
 #include "SubstituteData.h"
 #include <wtf/MainThread.h>
 #include <wtf/Threading.h>
 
 #undef LOG
 
 #include "base/logging.h"
 #include "webkit/api/public/WebFrameClient.h"
 #include "webkit/api/public/WebMessagePortChannel.h"
 #include "webkit/api/public/WebScreenInfo.h"
@@ skipping 88 matching lines @@
     WebCore::ScriptExecutionContext* context,
     WebWorkerImpl* this_ptr,
     const WebCore::String& message,
     WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
   DCHECK(context->isWorkerContext());
   WebCore::DedicatedWorkerContext* worker_context =
       static_cast<WebCore::DedicatedWorkerContext*>(context);
 
   WTF::OwnPtr<WebCore::MessagePortArray> ports =
       WebCore::MessagePort::entanglePorts(*context, channels.release());
+  WTF::RefPtr<WebCore::SerializedScriptValue> serialized_message =
+      WebCore::SerializedScriptValue::create(message);
   worker_context->dispatchEvent(
-      WebCore::MessageEvent::create(ports.release(), message));
+      WebCore::MessageEvent::create(ports.release(),
+                                    serialized_message.release()));
 
   this_ptr->confirmMessageFromWorkerObject(
       worker_context->hasPendingActivity());
 }
 
 // WebWorker -------------------------------------------------------------------
 
 void WebWorkerImpl::startWorkerContext(const WebURL& script_url,
                                        const WebString& user_agent,
                                        const WebString& source_code) {
@@ skipping 84 matching lines @@
 void WebWorkerImpl::InvokeTaskMethod(void* param) {
   WebCore::ScriptExecutionContext::Task* task =
       static_cast<WebCore::ScriptExecutionContext::Task*>(param);
   task->performTask(NULL);
   task->deref();
 }
 
 // WorkerObjectProxy -----------------------------------------------------------
 
 void WebWorkerImpl::postMessageToWorkerObject(
-    const WebCore::String& message,
+    WTF::PassRefPtr<WebCore::SerializedScriptValue> message,
     WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
   DispatchTaskToMainThread(WebCore::createCallbackTask(
       &PostMessageTask,
       this,
-      message,
+      message->toString(),
       channels));
 }
 
 void WebWorkerImpl::PostMessageTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerImpl* this_ptr,
     WebCore::String message,
     WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
   WebMessagePortChannelArray web_channels(
       channels.get() ? channels->size() : 0);
@@ skipping 131 matching lines @@
 
 namespace WebKit {
 
 WebWorker* WebWorker::create(WebWorkerClient* client) {
   return NULL;
 }
 
 }
 
 #endif