Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 21 insertions, 10 deletions

diff --git a/WebCore/workers/SharedWorker.cpp b/WebCore/workers/SharedWorker.cpp
index cd856ff..b25b28e 100644
--- a/WebCore/workers/SharedWorker.cpp
+++ b/WebCore/workers/SharedWorker.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -42,22 +43,32 @@
 
 namespace WebCore {
 
-SharedWorker::SharedWorker(const String& url, const String& name, ScriptExecutionContext* context, ExceptionCode& ec)
+inline SharedWorker::SharedWorker(ScriptExecutionContext* context)
     : AbstractWorker(context)
 {
-    RefPtr<MessageChannel> channel = MessageChannel::create(scriptExecutionContext());
-    m_port = channel->port1();
+}
+
+PassRefPtr<SharedWorker> SharedWorker::create(const String& url, const String& name, ScriptExecutionContext* context, ExceptionCode& ec)
+{
+    RefPtr<SharedWorker> worker = adoptRef(new SharedWorker(context));
+
+    RefPtr<MessageChannel> channel = MessageChannel::create(context);
+    worker->m_port = channel->port1();
     OwnPtr<MessagePortChannel> remotePort = channel->port2()->disentangle(ec);
-    ASSERT(!ec);
+    ASSERT(remotePort);
+
+    KURL scriptURL = worker->resolveURL(url, ec);
+    if (scriptURL.isEmpty())
+        return 0;
+
+    SharedWorkerRepository::connect(worker.get(), remotePort.release(), scriptURL, name, ec);
 
-    KURL scriptUrl = resolveURL(url, ec);
-    if (ec)
-        return;
-    SharedWorkerRepository::connect(this, remotePort.release(), scriptUrl, name, ec);
 #if ENABLE(INSPECTOR)
-    if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
-        inspector->didCreateWorker(asID(), scriptUrl.string(), true);
+    if (InspectorController* inspector = context->inspectorController())
+        inspector->didCreateWorker(worker->asID(), scriptURL.string(), true);
 #endif
+
+    return worker.release();
 }
 
 SharedWorker::~SharedWorker()