diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/workers/DedicatedWorkerContext.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/workers/DedicatedWorkerContext.cpp')
| -rw-r--r-- | WebCore/workers/DedicatedWorkerContext.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/workers/DedicatedWorkerContext.cpp b/WebCore/workers/DedicatedWorkerContext.cpp index 82dc4b3..54b5ba8 100644 --- a/WebCore/workers/DedicatedWorkerContext.cpp +++ b/WebCore/workers/DedicatedWorkerContext.cpp @@ -62,8 +62,6 @@ void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> messa void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec) { - if (isClosing()) - return; // Disentangle the port in preparation for sending it to the remote context. OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec); if (ec) @@ -71,9 +69,9 @@ void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> messa thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.release()); } -void DedicatedWorkerContext::importScripts(const Vector<String>& urls, const String& callerURL, int callerLine, ExceptionCode& ec) +void DedicatedWorkerContext::importScripts(const Vector<String>& urls, ExceptionCode& ec) { - Base::importScripts(urls, callerURL, callerLine, ec); + Base::importScripts(urls, ec); thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); } |