| Index: third_party/WebKit/Source/core/workers/WorkerObjectProxy.cpp
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerObjectProxy.cpp b/third_party/WebKit/Source/core/workers/WorkerObjectProxy.cpp
|
| index 830393f81f0c438b9252ef9c36480a6cf44d0b28..7f937b78e16d527dfd6a279337cc1cc0d169eda6 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerObjectProxy.cpp
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerObjectProxy.cpp
|
| @@ -50,55 +50,55 @@ PassOwnPtr<WorkerObjectProxy> WorkerObjectProxy::create(ExecutionContext* execut
|
|
|
| void WorkerObjectProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, PassOwnPtr<MessagePortChannelArray> channels)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postMessageToWorkerObject, m_messagingProxy, message, channels));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postMessageToWorkerObject, m_messagingProxy, message, channels));
|
| }
|
|
|
| void WorkerObjectProxy::postTaskToMainExecutionContext(PassOwnPtr<ExecutionContextTask> task)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, task);
|
| + m_executionContext->postTask(BLINK_FROM_HERE, task);
|
| }
|
|
|
| void WorkerObjectProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::confirmMessageFromWorkerObject, m_messagingProxy, hasPendingActivity));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::confirmMessageFromWorkerObject, m_messagingProxy, hasPendingActivity));
|
| }
|
|
|
| void WorkerObjectProxy::reportPendingActivity(bool hasPendingActivity)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportPendingActivity, m_messagingProxy, hasPendingActivity));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportPendingActivity, m_messagingProxy, hasPendingActivity));
|
| }
|
|
|
| void WorkerObjectProxy::reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, int exceptionId)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportException, m_messagingProxy, errorMessage, lineNumber, columnNumber, sourceURL, exceptionId));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportException, m_messagingProxy, errorMessage, lineNumber, columnNumber, sourceURL, exceptionId));
|
| }
|
|
|
| void WorkerObjectProxy::reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleMessage)
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportConsoleMessage, m_messagingProxy, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url()));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::reportConsoleMessage, m_messagingProxy, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url()));
|
| }
|
|
|
| void WorkerObjectProxy::postMessageToPageInspector(const String& message)
|
| {
|
| if (m_executionContext->isDocument())
|
| - toDocument(m_executionContext)->postInspectorTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy, message));
|
| + toDocument(m_executionContext)->postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy, message));
|
| }
|
|
|
| void WorkerObjectProxy::postWorkerConsoleAgentEnabled()
|
| {
|
| if (m_executionContext->isDocument())
|
| - toDocument(m_executionContext)->postInspectorTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postWorkerConsoleAgentEnabled, m_messagingProxy));
|
| + toDocument(m_executionContext)->postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::postWorkerConsoleAgentEnabled, m_messagingProxy));
|
| }
|
|
|
| void WorkerObjectProxy::workerGlobalScopeClosed()
|
| {
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::terminateWorkerGlobalScope, m_messagingProxy));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::terminateWorkerGlobalScope, m_messagingProxy));
|
| }
|
|
|
| void WorkerObjectProxy::workerThreadTerminated()
|
| {
|
| // This will terminate the MessagingProxy.
|
| - m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::workerThreadTerminated, m_messagingProxy));
|
| + m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerMessagingProxy::workerThreadTerminated, m_messagingProxy));
|
| }
|
|
|
| WorkerObjectProxy::WorkerObjectProxy(ExecutionContext* executionContext, WorkerMessagingProxy* messagingProxy)
|
|
|