Fix worker constructor so that nested worker can be created.

Review URL: http://codereview.chromium.org/67093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13619 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 6 deletions

diff --git a/webkit/port/bindings/v8/V8WorkerCustom.cpp b/webkit/port/bindings/v8/V8WorkerCustom.cpp
index 1f7e5fe..d5c2661 100644
--- a/webkit/port/bindings/v8/V8WorkerCustom.cpp
+++ b/webkit/port/bindings/v8/V8WorkerCustom.cpp
@@ -42,6 +42,7 @@
 #include "V8HTMLDocument.h"
 #include "V8ObjectEventListener.h"
 #include "Worker.h"
+#include "WorkerContext.h"
 #include "WorkerContextExecutionProxy.h"
 
 namespace WebCore {
@@ -75,18 +76,24 @@ CALLBACK_FUNC_DECL(WorkerConstructor) {
     return v8::Undefined();
   }
 
-  // Get the document.
-  Frame* frame = V8Proxy::retrieveFrame();
-  if (!frame)
-    return v8::Undefined();
-  Document* document = frame->document();
+  // Get the script execution context.
+  ScriptExecutionContext* context = 0;
+  WorkerContextExecutionProxy* proxy = WorkerContextExecutionProxy::retrieve();
+  if (proxy)
+    context = proxy->workerContext();
+  else {
+    Frame* frame = V8Proxy::retrieveFrame();
+    if (!frame)
+      return v8::Undefined();
+    context = frame->document();
+  }
 
   // Create the worker object.
   // Note: it's OK to let this RefPtr go out of scope because we also call
   // SetDOMWrapper(), which effectively holds a reference to obj.
   ExceptionCode ec = 0;
   RefPtr<Worker> obj = Worker::create(
-      ToWebCoreString(script_url), document, ec);
+      ToWebCoreString(script_url), context, ec);
 
   // Setup the standard wrapper object internal fields.
   v8::Handle<v8::Object> wrapper_object = args.Holder();