Change d8 Worker API so it takes a string instead of a function.

src/d8.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 // Defined when linking against shared lib on Windows.
 #if defined(USING_V8_SHARED) && !defined(V8_SHARED)
 #define V8_SHARED
 #endif
 
@@ skipping 672 matching lines @@
       return;
     }
   }
 }
 
 
 #ifndef V8_SHARED
 void Shell::WorkerNew(const v8::FunctionCallbackInfo<v8::Value>& args) {
   Isolate* isolate = args.GetIsolate();
   HandleScope handle_scope(isolate);
-  if (args.Length() < 1 || !args[0]->IsFunction()) {
-    Throw(args.GetIsolate(), "1st argument must be function");
+  if (args.Length() < 1 || !args[0]->IsString()) {
+    Throw(args.GetIsolate(), "1st argument must be string");
     return;
   }
 
   {
     base::LockGuard<base::Mutex> lock_guard(&workers_mutex_);
     if (!allow_new_workers_) return;
 
     Worker* worker = new Worker;
     args.This()->SetInternalField(0, External::New(isolate, worker));
     workers_.Add(worker);
 
-    String::Utf8Value function_string(args[0]->ToString());
-    if (!*function_string) {
-      Throw(args.GetIsolate(), "Function.prototype.toString failed");
+    String::Utf8Value script(args[0]);
+    if (!*script) {
+      Throw(args.GetIsolate(), "Can't get worker script");
       return;
     }
-    worker->StartExecuteInThread(isolate, *function_string);
+    worker->StartExecuteInThread(isolate, *script);
   }
 }
 
 
 void Shell::WorkerPostMessage(const v8::FunctionCallbackInfo<v8::Value>& args) {
   Isolate* isolate = args.GetIsolate();
   HandleScope handle_scope(isolate);
   Local<Context> context = isolate->GetCurrentContext();
 
   if (args.Length() < 1) {
@@ skipping 912 matching lines @@
     : in_semaphore_(0),
       out_semaphore_(0),
       thread_(NULL),
       script_(NULL),
       state_(IDLE) {}
 
 
 Worker::~Worker() { Cleanup(); }
 
 
-void Worker::StartExecuteInThread(Isolate* isolate,
-                                  const char* function_string) {
-  DCHECK(base::NoBarrier_Load(&state_) == IDLE);
-  static const char format[] = "(%s).call(this);";
-  size_t len = strlen(function_string) + sizeof(format);
-
-  script_ = new char[len + 1];
-  i::Vector<char> vec(script_, static_cast<int>(len + 1));
-  i::SNPrintF(vec, format, function_string);
-
-  base::NoBarrier_Store(&state_, RUNNING);
-  thread_ = new WorkerThread(this);
-  thread_->Start();
+void Worker::StartExecuteInThread(Isolate* isolate, const char* script) {
+  if (base::NoBarrier_CompareAndSwap(&state_, IDLE, RUNNING) == IDLE) {
+    script_ = i::StrDup(script);
+    thread_ = new WorkerThread(this);
+    thread_->Start();
+  } else {
+    // Somehow the Worker was started twice.
+    UNREACHABLE();
+  }
 }
 
 
 void Worker::PostMessage(SerializationData* data) {
   in_queue_.Enqueue(data);
   in_semaphore_.Signal();
 }
 
 
 SerializationData* Worker::GetMessage() {
@@ skipping 767 matching lines @@
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif