Changeset 62696 in webkit

Timestamp:

Jul 7, 2010 1:55:37 PM (14 years ago)

Author:

Darin Adler

Message:

2010-07-07 Darin Adler <Darin Adler>

Reviewed by Adam Barth.

Turn on adoptRef assertion for RefCounted
​https://bugs.webkit.org/show_bug.cgi?id=41547

• wtf/CrossThreadRefCounted.h: Fixed include style. Includes of other WTF headers should use "" includes; consistent in most WTF headers. Added a call to relaxAdoptionRequirement.

• wtf/RefCounted.h: Fixed include style. Removed LOOSE_REF_COUNTED. Added relaxAdoptionRequirement.

2010-07-07 Darin Adler <Darin Adler>

Reviewed by Adam Barth.

Turn on adoptRef assertion for RefCounted
​https://bugs.webkit.org/show_bug.cgi?id=41547

The WebCore part of this fixes all the assertions I saw in testing.

• html/FileReader.cpp: (WebCore::FileReader::readAsBinaryString): Added null checks. Callers from JavaScript can pass the wrong type, which becomes null. (WebCore::FileReader::readAsText): Ditto. (WebCore::FileReader::readAsDataURL): Ditto.

• html/FileStreamClient.h: Removed unneeded include.

• html/FileStreamProxy.cpp: (WebCore::FileStreamProxy::FileStreamProxy): Made inline and moved some of the code, including the ref, into the create function. (WebCore::FileStreamProxy::create): Moved some of the code from the constructor here. It's safe to ref once the object has been created and adopted.

• html/FileStreamProxy.h: Changed create function to no longer be inlined. Also removed an unneeded include.

• page/EventSource.cpp: (WebCore::EventSource::EventSource): Made inline, changed arguments and moved code that involves the need to ref this object into the create function. Also moved failure handling out there since it's cleaner to have a function that fails than a constructor. For example, the function can return 0. (WebCore::EventSource::create): Moved some of the code from the constructor here.

• page/EventSource.h: Removed unneeded includes. Made the creation function non-inline. Changed the arguments to the constructor.

• storage/StorageAreaSync.cpp: (WebCore::StorageAreaSync::StorageAreaSync): Made inline. Moved code that requires ref'ing this object out to the create function. (WebCore::StorageAreaSync::create): Moved some of the code from the constructor here.

• storage/StorageAreaSync.h: Removed unneeded includes. Changed the type of one of the constructor arguments from String to const String&.

• workers/SharedWorker.cpp: (WebCore::SharedWorker::SharedWorker): Made inline. Moved most of the setup code out of here into the create function. (WebCore::SharedWorker::create): Moved the code here.

• workers/SharedWorker.h: Removed unneeded includes. Made the create function non-inline. Marked the toSharedWorker override private to catch people doing an unnecessary virtual function call if they already have a SharedWorker*.

• workers/Worker.cpp: (WebCore::Worker::Worker): Made inline. Moved most of the setup code out of here into the create function. (WebCore::Worker::create): Moved the code here.

• workers/Worker.h: Made the create function non-inline. Changed the arguments to the constructor.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/CrossThreadRefCounted.h (modified) (3 diffs)
• JavaScriptCore/wtf/RefCounted.h (modified) (5 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/FileReader.cpp (modified) (3 diffs)
• WebCore/html/FileStreamClient.h (modified) (1 diff)
• WebCore/html/FileStreamProxy.cpp (modified) (1 diff)
• WebCore/html/FileStreamProxy.h (modified) (3 diffs)
• WebCore/page/EventSource.cpp (modified) (3 diffs)
• WebCore/page/EventSource.h (modified) (5 diffs)
• WebCore/storage/StorageAreaSync.cpp (modified) (3 diffs)
• WebCore/storage/StorageAreaSync.h (modified) (4 diffs)
• WebCore/workers/SharedWorker.cpp (modified) (2 diffs)
• WebCore/workers/SharedWorker.h (modified) (3 diffs)
• WebCore/workers/Worker.cpp (modified) (2 diffs)
• WebCore/workers/Worker.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-07  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Turn on adoptRef assertion for RefCounted
+        https://bugs.webkit.org/show_bug.cgi?id=41547
+
+        * wtf/CrossThreadRefCounted.h: Fixed include style. Includes of other
+        WTF headers should use "" includes; consistent in most WTF headers.
+        Added a call to relaxAdoptionRequirement.
+
+        * wtf/RefCounted.h: Fixed include style. Removed LOOSE_REF_COUNTED.
+        Added relaxAdoptionRequirement.
+
 2010-07-07  Anders Carlsson  <andersca@apple.com>
 

trunk/JavaScriptCore/wtf/CrossThreadRefCounted.h

@@ -1 +1 @@
 /*
  * 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
@@ -32 +33 @@
 #define CrossThreadRefCounted_h
 
-#include <wtf/Noncopyable.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Threading.h>
+#include "PassRefPtr.h"
+#include "RefCounted.h"
+#include "Threading.h"
 
 namespace WTF {
@@ -79 +79 @@
 #endif
         {
+            // We use RefCountedBase in an unusual way here, so get rid of the requirement
+            // that adoptRef be called on it.
+            m_refCounter.relaxAdoptionRequirement();
         }
 

trunk/JavaScriptCore/wtf/RefCounted.h

@@ -22 +22 @@
 #define RefCounted_h
 
-#include <wtf/Assertions.h>
-#include <wtf/Noncopyable.h>
-
-// Remove this once we make all WebKit code compatible with stricter rules about RefCounted.
-#define LOOSE_REF_COUNTED
+#include "Assertions.h"
+#include "Noncopyable.h"
 
 namespace WTF {
@@ -38 +35 @@
     {
         ASSERT(!m_deletionHasBegun);
-#ifndef LOOSE_REF_COUNTED
         ASSERT(!m_adoptionIsRequired);
-#endif
         ++m_refCount;
     }
@@ -55 +50 @@
     }
 
+    void relaxAdoptionRequirement()
+    {
+#ifndef NDEBUG
+        ASSERT(!m_deletionHasBegun);
+        ASSERT(m_adoptionIsRequired);
+        m_adoptionIsRequired = false;
+#endif
+    }
+
 protected:
     RefCountedBase()
@@ -67 +71 @@
     ~RefCountedBase()
     {
-#ifndef LOOSE_REF_COUNTED
         ASSERT(m_deletionHasBegun);
         ASSERT(!m_adoptionIsRequired);
-#endif
     }
 
@@ -77 +79 @@
     {
         ASSERT(!m_deletionHasBegun);
-#ifndef LOOSE_REF_COUNTED
         ASSERT(!m_adoptionIsRequired);
-#endif
 
         ASSERT(m_refCount > 0);

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Turn on adoptRef assertion for RefCounted
+        https://bugs.webkit.org/show_bug.cgi?id=41547
+
+        The WebCore part of this fixes all the assertions I saw in testing.
+
+        * html/FileReader.cpp:
+        (WebCore::FileReader::readAsBinaryString): Added null checks.
+        Callers from JavaScript can pass the wrong type, which becomes null.
+        (WebCore::FileReader::readAsText): Ditto.
+        (WebCore::FileReader::readAsDataURL): Ditto.
+
+        * html/FileStreamClient.h: Removed unneeded include.
+
+        * html/FileStreamProxy.cpp:
+        (WebCore::FileStreamProxy::FileStreamProxy): Made inline and moved
+        some of the code, including the ref, into the create function.
+        (WebCore::FileStreamProxy::create): Moved some of the code from
+        the constructor here. It's safe to ref once the object has been
+        created and adopted.
+
+        * html/FileStreamProxy.h: Changed create function to no longer be
+        inlined. Also removed an unneeded include.
+
+        * page/EventSource.cpp:
+        (WebCore::EventSource::EventSource): Made inline, changed arguments
+        and moved code that involves the need to ref this object into the
+        create function. Also moved failure handling out there since it's
+        cleaner to have a function that fails than a constructor. For
+        example, the function can return 0.
+        (WebCore::EventSource::create): Moved some of the code from the
+        constructor here.
+
+        * page/EventSource.h: Removed unneeded includes. Made the
+        creation function non-inline. Changed the arguments to the constructor.
+
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::StorageAreaSync): Made inline. Moved
+        code that requires ref'ing this object out to the create function.
+        (WebCore::StorageAreaSync::create): Moved some of the code from the
+        constructor here.
+
+        * storage/StorageAreaSync.h: Removed unneeded includes. Changed
+        the type of one of the constructor arguments from String to
+        const String&.
+
+        * workers/SharedWorker.cpp:
+        (WebCore::SharedWorker::SharedWorker): Made inline. Moved most of
+        the setup code out of here into the create function.
+        (WebCore::SharedWorker::create): Moved the code here.
+
+        * workers/SharedWorker.h: Removed unneeded includes. Made the
+        create function non-inline. Marked the toSharedWorker override private
+        to catch people doing an unnecessary virtual function call if they
+        already have a SharedWorker*.
+
+        * workers/Worker.cpp:
+        (WebCore::Worker::Worker): Made inline. Moved most of the setup code
+        out of here into the create function.
+        (WebCore::Worker::create): Moved the code here.
+
+        * workers/Worker.h: Made the create function non-inline. Changed
+        the arguments to the constructor.
+
 2010-07-07  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/html/FileReader.cpp

@@ -86 +86 @@
 void FileReader::readAsBinaryString(Blob* fileBlob)
 {
+    if (!fileBlob)
+        return;
+
     // FIXME: needs to handle non-file blobs.
     LOG(FileAPI, "FileReader: reading as binary: %s\n", fileBlob->path().utf8().data());
@@ -94 +97 @@
 void FileReader::readAsText(Blob* fileBlob, const String& encoding)
 {
+    if (!fileBlob)
+        return;
+
     // FIXME: needs to handle non-file blobs.
     LOG(FileAPI, "FileReader: reading as text: %s\n", fileBlob->path().utf8().data());
@@ -104 +110 @@
 void FileReader::readAsDataURL(File* file)
 {
+    if (!file)
+        return;
+
     LOG(FileAPI, "FileReader: reading as data URL: %s\n", file->path().utf8().data());
 

trunk/WebCore/html/FileStreamClient.h

@@ -35 +35 @@
 
 #include "ExceptionCode.h"
-#include <wtf/PassRefPtr.h>
 
 namespace WebCore {

trunk/WebCore/html/FileStreamProxy.cpp

@@ -45 +45 @@
 namespace WebCore {
 
-FileStreamProxy::FileStreamProxy(ScriptExecutionContext* context, FileStreamClient* client)
+inline FileStreamProxy::FileStreamProxy(ScriptExecutionContext* context, FileStreamClient* client)
     : m_context(context)
     , m_client(client)
     , m_stream(FileStream::create(this))
 {
-    // Holds an extra ref so that the instance will not get deleted while there can be any tasks on the file thread.
-    ref();
-
-    fileThread()->postTask(createFileThreadTask(m_stream.get(), &FileStream::start));
+}
+
+PassRefPtr<FileStreamProxy> FileStreamProxy::create(ScriptExecutionContext* context, FileStreamClient* client)
+{
+    RefPtr<FileStreamProxy> proxy = adoptRef(new FileStreamProxy(context, client));
+
+    // Hold an ref so that the instance will not get deleted while there are tasks on the file thread.
+    // This is balanced by the deref in derefProxyOnContext below.
+    proxy->ref();
+
+    proxy->fileThread()->postTask(createFileThreadTask(proxy->m_stream.get(), &FileStream::start));
+
+    return proxy.release();
 }
 

trunk/WebCore/html/FileStreamProxy.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Google Inc.  All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34 +35 @@
 #if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
 
-#include "ExceptionCode.h"
 #include "FileStreamClient.h"
 #include <wtf/PassRefPtr.h>
@@ -51 +51 @@
 class FileStreamProxy : public RefCounted<FileStreamProxy>, public FileStreamClient {
 public:
-    static PassRefPtr<FileStreamProxy> create(ScriptExecutionContext* context, FileStreamClient* client)
-    {
-        return adoptRef(new FileStreamProxy(context, client));
-    }
+    static PassRefPtr<FileStreamProxy> create(ScriptExecutionContext*, FileStreamClient*);
     virtual ~FileStreamProxy();
 

trunk/WebCore/page/EventSource.cpp

@@ -2 +2 @@
  * Copyright (C) 2009 Ericsson AB
  * All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54 +55 @@
 const unsigned long long EventSource::defaultReconnectDelay = 3000;
 
-EventSource::EventSource(const String& url, ScriptExecutionContext* context, ExceptionCode& ec)
+inline EventSource::EventSource(const KURL& url, ScriptExecutionContext* context)
     : ActiveDOMObject(context, this)
+    , m_url(url)
     , m_state(CONNECTING)
+    , m_decoder(TextResourceDecoder::create("text/plain", "UTF-8"))
     , m_reconnectTimer(this, &EventSource::reconnectTimerFired)
     , m_discardTrailingNewline(false)
@@ -62 +65 @@
     , m_requestInFlight(false)
     , m_reconnectDelay(defaultReconnectDelay)
-{
-    if (url.isEmpty() || !(m_url = context->completeURL(url)).isValid()) {
+    , m_origin(context->securityOrigin()->toString())
+{
+}
+
+PassRefPtr<EventSource> EventSource::create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec)
+{
+    if (url.isEmpty()) {
         ec = SYNTAX_ERR;
-        return;
-    }
-    // FIXME: should support cross-origin requests
-    if (!scriptExecutionContext()->securityOrigin()->canRequest(m_url)) {
+        return 0;
+    }
+
+    KURL fullURL = context->completeURL(url);
+    if (!fullURL.isValid()) {
+        ec = SYNTAX_ERR;
+        return 0;
+    }
+
+    // FIXME: Should support at least some cross-origin requests.
+    if (!context->securityOrigin()->canRequest(fullURL)) {
         ec = SECURITY_ERR;
-        return;
-    }
-
-    m_origin = scriptExecutionContext()->securityOrigin()->toString();
-    m_decoder = TextResourceDecoder::create("text/plain", "UTF-8");
-
-    setPendingActivity(this);
-    connect();
+        return 0;
+    }
+
+    RefPtr<EventSource> source = adoptRef(new EventSource(fullURL, context));
+
+    source->setPendingActivity(source.get());
+    source->connect();
+
+    return source.release();
 }
 

trunk/WebCore/page/EventSource.h

@@ -2 +2 @@
  * Copyright (C) 2009 Ericsson AB
  * All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +37 @@
 
 #include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
-#include "EventNames.h"
 #include "EventTarget.h"
 #include "KURL.h"
 #include "ThreadableLoaderClient.h"
 #include "Timer.h"
-
-#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
@@ -57 +53 @@
     class EventSource : public RefCounted<EventSource>, public EventTarget, private ThreadableLoaderClient, public ActiveDOMObject {
     public:
-        static PassRefPtr<EventSource> create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec) { return adoptRef(new EventSource(url, context, ec)); }
+        static PassRefPtr<EventSource> create(const String& url, ScriptExecutionContext*, ExceptionCode&);
         virtual ~EventSource();
 
@@ -87 +83 @@
 
     private:
-        EventSource(const String& url, ScriptExecutionContext* context, ExceptionCode& ec);
+        EventSource(const KURL&, ScriptExecutionContext*);
 
         virtual void refEventTarget() { ref(); }
@@ -94 +90 @@
         virtual EventTargetData* ensureEventTargetData();
 
-        virtual void didReceiveResponse(const ResourceResponse& response);
+        virtual void didReceiveResponse(const ResourceResponse&);
         virtual void didReceiveData(const char* data, int length);
         virtual void didFinishLoading(unsigned long);
-        virtual void didFail(const ResourceError& error);
+        virtual void didFail(const ResourceError&);
         virtual void didFailRedirectCheck();
 

trunk/WebCore/storage/StorageAreaSync.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50 +50 @@
 static const int MaxiumItemsToSync = 100;
 
-PassRefPtr<StorageAreaSync> StorageAreaSync::create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, String databaseIdentifier)
-{
-    return adoptRef(new StorageAreaSync(storageSyncManager, storageArea, databaseIdentifier));
-}
-
-StorageAreaSync::StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, String databaseIdentifier)
+inline StorageAreaSync::StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
     : m_syncTimer(this, &StorageAreaSync::syncTimerFired)
     , m_itemsCleared(false)
@@ -71 +66 @@
     ASSERT(m_storageArea);
     ASSERT(m_syncManager);
+}
+
+PassRefPtr<StorageAreaSync> StorageAreaSync::create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
+{
+    RefPtr<StorageAreaSync> area = adoptRef(new StorageAreaSync(storageSyncManager, storageArea, databaseIdentifier));
 
     // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
-    // not silently ignoring it.  https://bugs.webkit.org/show_bug.cgi?id=25894
-    if (!m_syncManager->scheduleImport(this))
-        m_importComplete = true;
+    // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
+    if (!area->m_syncManager->scheduleImport(area.get()))
+        area->m_importComplete = true;
+
+    return area.release();
 }
 

trunk/WebCore/storage/StorageAreaSync.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 #if ENABLE(DOM_STORAGE)
 
-#include "PlatformString.h"
 #include "SQLiteDatabase.h"
 #include "StringHash.h"
@@ -43 +42 @@
     class StorageAreaSync : public RefCounted<StorageAreaSync> {
     public:
-        static PassRefPtr<StorageAreaSync> create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, String databaseIdentifier);
+        static PassRefPtr<StorageAreaSync> create(PassRefPtr<StorageSyncManager>, PassRefPtr<StorageAreaImpl>, const String& databaseIdentifier);
         ~StorageAreaSync();
 
@@ -53 +52 @@
 
     private:
-        StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, String databaseIdentifier);
+        StorageAreaSync(PassRefPtr<StorageSyncManager>, PassRefPtr<StorageAreaImpl>, const String& databaseIdentifier);
 
         void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame);

trunk/WebCore/workers/SharedWorker.cpp

@@ -1 +1 @@
 /*
  * 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
@@ -43 +44 @@
 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 = resolveURL(url, ec);
-    if (ec)
-        return;
-    SharedWorkerRepository::connect(this, remotePort.release(), scriptUrl, name, ec);
+    KURL scriptURL = worker->resolveURL(url, ec);
+    if (scriptURL.isEmpty())
+        return 0;
+
+    SharedWorkerRepository::connect(worker.get(), 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();
 }
 

trunk/WebCore/workers/SharedWorker.h

@@ -1 +1 @@
 /*
  * 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
@@ -34 +35 @@
 #include "AbstractWorker.h"
 
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-
 #if ENABLE(SHARED_WORKERS)
 
@@ -43 +41 @@
     class SharedWorker : public AbstractWorker {
     public:
-        static PassRefPtr<SharedWorker> create(const String& url, const String& name, ScriptExecutionContext* context, ExceptionCode& ec)
-        {
-            return adoptRef(new SharedWorker(url, name, context, ec));
-        }
-        ~SharedWorker();
+        static PassRefPtr<SharedWorker> create(const String& url, const String& name, ScriptExecutionContext*, ExceptionCode&);
+        virtual ~SharedWorker();
+
         MessagePort* port() const { return m_port.get(); }
 
+    private:
+        SharedWorker(ScriptExecutionContext*);
+
         virtual SharedWorker* toSharedWorker() { return this; }
-
-    private:
-        SharedWorker(const String& url, const String& name, ScriptExecutionContext*, ExceptionCode&);
 
         RefPtr<MessagePort> m_port;

trunk/WebCore/workers/Worker.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Google Inc. All Rights Reserved.
  *
@@ -51 +51 @@
 namespace WebCore {
 
-Worker::Worker(const String& url, ScriptExecutionContext* context, ExceptionCode& ec)
+inline Worker::Worker(ScriptExecutionContext* context)
     : AbstractWorker(context)
     , m_contextProxy(WorkerContextProxy::create(this))
 {
-    KURL scriptURL = resolveURL(url, ec);
-    if (ec)
-        return;
+}
 
-    m_scriptLoader = new WorkerScriptLoader(ResourceRequestBase::TargetIsWorker);
-    m_scriptLoader->loadAsynchronously(scriptExecutionContext(), scriptURL, DenyCrossOriginRequests, this);
-    setPendingActivity(this);  // The worker context does not exist while loading, so we must ensure that the worker object is not collected, as well as its event listeners.
+PassRefPtr<Worker> Worker::create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec)
+{
+    RefPtr<Worker> worker = adoptRef(new Worker(context));
+
+    KURL scriptURL = worker->resolveURL(url, ec);
+    if (scriptURL.isEmpty())
+        return 0;
+
+    worker->m_scriptLoader = adoptPtr(new WorkerScriptLoader(ResourceRequestBase::TargetIsWorker));
+    worker->m_scriptLoader->loadAsynchronously(context, scriptURL, DenyCrossOriginRequests, worker.get());
+
+    // The worker context does not exist while loading, so we must ensure that the worker object is not collected, nor are its event listeners.
+    worker->setPendingActivity(worker.get());
+
 #if ENABLE(INSPECTOR)
-    if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
-        inspector->didCreateWorker(asID(), scriptURL.string(), false);
+    if (InspectorController* inspector = context->inspectorController())
+        inspector->didCreateWorker(worker->asID(), scriptURL.string(), false);
 #endif
+
+    return worker.release();
 }
 

trunk/WebCore/workers/Worker.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54 +54 @@
     class Worker : public AbstractWorker, private WorkerScriptLoaderClient {
     public:
-        static PassRefPtr<Worker> create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec) { return adoptRef(new Worker(url, context, ec)); }
-        ~Worker();
+        static PassRefPtr<Worker> create(const String& url, ScriptExecutionContext*, ExceptionCode&);
+        virtual ~Worker();
 
         virtual Worker* toWorker() { return this; }
 
-        void postMessage(PassRefPtr<SerializedScriptValue>, ExceptionCode&);
-        void postMessage(PassRefPtr<SerializedScriptValue>, const MessagePortArray*, ExceptionCode&);
+        void postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode&);
+        void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionCode&);
         // FIXME: remove this when we update the ObjC bindings (bug #28774).
         void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
@@ -73 +73 @@
 
     private:
-        Worker(const String&, ScriptExecutionContext*, ExceptionCode&);
+        Worker(ScriptExecutionContext*);
 
         virtual void notifyFinished();