| Index: Source/core/workers/DedicatedWorkerGlobalScope.cpp
|
| diff --git a/Source/core/workers/DedicatedWorkerGlobalScope.cpp b/Source/core/workers/DedicatedWorkerGlobalScope.cpp
|
| index ed4fbb1b64804df8c98238c24e0992edba8ebcb6..56c1763e4858d3a332608afa1b18498c222b744e 100644
|
| --- a/Source/core/workers/DedicatedWorkerGlobalScope.cpp
|
| +++ b/Source/core/workers/DedicatedWorkerGlobalScope.cpp
|
| @@ -62,18 +62,18 @@ const AtomicString& DedicatedWorkerGlobalScope::interfaceName() const
|
| return EventTargetNames::DedicatedWorkerGlobalScope;
|
| }
|
|
|
| -void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionState& es)
|
| +void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionState& exceptionState)
|
| {
|
| // Disentangle the port in preparation for sending it to the remote context.
|
| - OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, es);
|
| - if (es.hadException())
|
| + OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, exceptionState);
|
| + if (exceptionState.hadException())
|
| return;
|
| thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.release());
|
| }
|
|
|
| -void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState& es)
|
| +void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState& exceptionState)
|
| {
|
| - Base::importScripts(urls, es);
|
| + Base::importScripts(urls, exceptionState);
|
| thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity());
|
| }
|
|
|
|
|