Webkit roll: 49213:49221

webkit/glue/webworkerclient_impl.cc

Index: webkit/glue/webworkerclient_impl.cc
===================================================================
--- webkit/glue/webworkerclient_impl.cc	(revision 28228)
+++ webkit/glue/webworkerclient_impl.cc	(working copy)
@@ -154,7 +154,7 @@
 }
 
 void WebWorkerClientImpl::postMessageToWorkerContext(
-    const WebCore::String& message,
+    WTF::PassRefPtr<WebCore::SerializedScriptValue> message,
     WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
   // Worker.terminate() could be called from JS before the context is started.
   if (asked_to_terminate_)
@@ -165,7 +165,7 @@
   if (!WTF::isMainThread()) {
     WebWorkerImpl::DispatchTaskToMainThread(
         WebCore::createCallbackTask(
-            &PostMessageToWorkerContextTask, this, message, channels));
+            &PostMessageToWorkerContextTask, this, message->toString(), channels));

[Dmitry Titov, 2009/10/07 04:06:51]

80

     return;
   }
 
@@ -179,7 +179,7 @@
   }
 
   webworker_->postMessageToWorkerContext(
-      webkit_glue::StringToWebString(message), webchannels);
+      webkit_glue::StringToWebString(message->toString()), webchannels);
 }
 
 bool WebWorkerClientImpl::hasPendingActivity() const {
@@ -349,8 +349,10 @@
   if (this_ptr->worker_) {
     WTF::OwnPtr<WebCore::MessagePortArray> ports =
         WebCore::MessagePort::entanglePorts(*context, channels.release());
+    WTF::RefPtr<WebCore::SerializedScriptValue> serialized_message =
+        WebCore::SerializedScriptValue::create(message);
     this_ptr->worker_->dispatchEvent(
-        WebCore::MessageEvent::create(ports.release(), message));
+        WebCore::MessageEvent::create(ports.release(), serialized_message.release()));

[Dmitry Titov, 2009/10/07 04:06:51]

80

   }
 }