Webkit roll: 49213:49221

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 136 matching lines @@
   if (!WTF::isMainThread()) {
     WebWorkerImpl::DispatchTaskToMainThread(
         WebCore::createCallbackTask(&TerminateWorkerContextTask, this));
     return;
   }
 
   webworker_->terminateWorkerContext();
 }
 
 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_)
     return;
 
   ++unconfirmed_message_count_;
 
   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;
   }
 
   WebMessagePortChannelArray webchannels(channels.get() ? channels->size() : 0);
 
   for (size_t i = 0; i < webchannels.size(); ++i) {
     WebMessagePortChannel* webchannel =
         (*channels)[i]->channel()->webChannelRelease();
     webchannel->setClient(0);
     webchannels[i] = webchannel;
   }
 
   webworker_->postMessageToWorkerContext(
-      webkit_glue::StringToWebString(message), webchannels);
+      webkit_glue::StringToWebString(message->toString()), webchannels);
 }
 
 bool WebWorkerClientImpl::hasPendingActivity() const {
   return !asked_to_terminate_ &&
       (unconfirmed_message_count_ || worker_context_had_pending_activity_);
 }
 
 void WebWorkerClientImpl::workerObjectDestroyed() {
   if (WTF::isMainThread()) {
     webworker_->workerObjectDestroyed();
@@ skipping 149 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());
+    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

   }
 }
 
 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;
@@ skipping 32 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