| Index: Source/core/workers/Worker.cpp
|
| diff --git a/Source/core/workers/Worker.cpp b/Source/core/workers/Worker.cpp
|
| index 0ada7ac8b9e01df45f661a7bd9c1ec034f494ca3..51c08d40cfcbb84840ba3ef662726bad6c6c7861 100644
|
| --- a/Source/core/workers/Worker.cpp
|
| +++ b/Source/core/workers/Worker.cpp
|
| @@ -51,7 +51,7 @@ inline Worker::Worker(ExecutionContext* context)
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| -PassRefPtr<Worker> Worker::create(ExecutionContext* context, const String& url, ExceptionState& es)
|
| +PassRefPtr<Worker> Worker::create(ExecutionContext* context, const String& url, ExceptionState& exceptionState)
|
| {
|
| ASSERT(isMainThread());
|
| UseCounter::count(toDocument(context)->domWindow(), UseCounter::WorkerStart);
|
| @@ -60,7 +60,7 @@ PassRefPtr<Worker> Worker::create(ExecutionContext* context, const String& url,
|
|
|
| worker->suspendIfNeeded();
|
|
|
| - KURL scriptURL = worker->resolveURL(url, es);
|
| + KURL scriptURL = worker->resolveURL(url, exceptionState);
|
| if (scriptURL.isEmpty())
|
| return 0;
|
|
|
| @@ -85,11 +85,11 @@ const AtomicString& Worker::interfaceName() const
|
| return EventTargetNames::Worker;
|
| }
|
|
|
| -void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionState& es)
|
| +void Worker::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;
|
| m_contextProxy->postMessageToWorkerGlobalScope(message, channels.release());
|
| }
|
|
|