| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 PassOwnPtr<WorkerObjectProxy> WorkerObjectProxy::create(ExecutionContext* execut
ionContext, WorkerMessagingProxy* messagingProxy) | 45 PassOwnPtr<WorkerObjectProxy> WorkerObjectProxy::create(ExecutionContext* execut
ionContext, WorkerMessagingProxy* messagingProxy) |
| 46 { | 46 { |
| 47 return adoptPtr(new WorkerObjectProxy(executionContext, messagingProxy)); | 47 return adoptPtr(new WorkerObjectProxy(executionContext, messagingProxy)); |
| 48 } | 48 } |
| 49 | 49 |
| 50 void WorkerObjectProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptVal
ue> message, PassOwnPtr<MessagePortChannelArray> channels) | 50 void WorkerObjectProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptVal
ue> message, PassOwnPtr<MessagePortChannelArray> channels) |
| 51 { | 51 { |
| 52 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::po
stMessageToWorkerObject, m_messagingProxy, message, channels)); | 52 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::postMessageToWorkerObject, m_messagingProxy, message, channels)); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void WorkerObjectProxy::postTaskToMainExecutionContext(PassOwnPtr<ExecutionConte
xtTask> task) | 55 void WorkerObjectProxy::postTaskToMainExecutionContext(PassOwnPtr<ExecutionConte
xtTask> task) |
| 56 { | 56 { |
| 57 m_executionContext->postTask(task); | 57 m_executionContext->postTask(FROM_HERE, task); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void WorkerObjectProxy::confirmMessageFromWorkerObject(bool hasPendingActivity) | 60 void WorkerObjectProxy::confirmMessageFromWorkerObject(bool hasPendingActivity) |
| 61 { | 61 { |
| 62 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::co
nfirmMessageFromWorkerObject, m_messagingProxy, hasPendingActivity)); | 62 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::confirmMessageFromWorkerObject, m_messagingProxy, hasPendingActivity)); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void WorkerObjectProxy::reportPendingActivity(bool hasPendingActivity) | 65 void WorkerObjectProxy::reportPendingActivity(bool hasPendingActivity) |
| 66 { | 66 { |
| 67 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portPendingActivity, m_messagingProxy, hasPendingActivity)); | 67 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::reportPendingActivity, m_messagingProxy, hasPendingActivity)); |
| 68 } | 68 } |
| 69 | 69 |
| 70 void WorkerObjectProxy::reportException(const String& errorMessage, int lineNumb
er, int columnNumber, const String& sourceURL, int exceptionId) | 70 void WorkerObjectProxy::reportException(const String& errorMessage, int lineNumb
er, int columnNumber, const String& sourceURL, int exceptionId) |
| 71 { | 71 { |
| 72 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portException, m_messagingProxy, errorMessage, lineNumber, columnNumber, sourceU
RL, exceptionId)); | 72 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::reportException, m_messagingProxy, errorMessage, lineNumber, columnNumb
er, sourceURL, exceptionId)); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void WorkerObjectProxy::reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessa
ge> consoleMessage) | 75 void WorkerObjectProxy::reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessa
ge> consoleMessage) |
| 76 { | 76 { |
| 77 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portConsoleMessage, m_messagingProxy, consoleMessage->source(), consoleMessage->
level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage
->url())); | 77 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::reportConsoleMessage, m_messagingProxy, consoleMessage->source(), conso
leMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), con
soleMessage->url())); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void WorkerObjectProxy::postMessageToPageInspector(const String& message) | 80 void WorkerObjectProxy::postMessageToPageInspector(const String& message) |
| 81 { | 81 { |
| 82 if (m_executionContext->isDocument()) | 82 if (m_executionContext->isDocument()) |
| 83 toDocument(m_executionContext)->postInspectorTask(createCrossThreadTask(
&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy, message)); | 83 toDocument(m_executionContext)->postInspectorTask(FROM_HERE, createCross
ThreadTask(&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy,
message)); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void WorkerObjectProxy::postWorkerConsoleAgentEnabled() | 86 void WorkerObjectProxy::postWorkerConsoleAgentEnabled() |
| 87 { | 87 { |
| 88 if (m_executionContext->isDocument()) | 88 if (m_executionContext->isDocument()) |
| 89 toDocument(m_executionContext)->postInspectorTask(createCrossThreadTask(
&WorkerMessagingProxy::postWorkerConsoleAgentEnabled, m_messagingProxy)); | 89 toDocument(m_executionContext)->postInspectorTask(FROM_HERE, createCross
ThreadTask(&WorkerMessagingProxy::postWorkerConsoleAgentEnabled, m_messagingProx
y)); |
| 90 } | 90 } |
| 91 | 91 |
| 92 void WorkerObjectProxy::workerGlobalScopeClosed() | 92 void WorkerObjectProxy::workerGlobalScopeClosed() |
| 93 { | 93 { |
| 94 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::te
rminateWorkerGlobalScope, m_messagingProxy)); | 94 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::terminateWorkerGlobalScope, m_messagingProxy)); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void WorkerObjectProxy::workerThreadTerminated() | 97 void WorkerObjectProxy::workerThreadTerminated() |
| 98 { | 98 { |
| 99 // This will terminate the MessagingProxy. | 99 // This will terminate the MessagingProxy. |
| 100 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::wo
rkerThreadTerminated, m_messagingProxy)); | 100 m_executionContext->postTask(FROM_HERE, createCrossThreadTask(&WorkerMessagi
ngProxy::workerThreadTerminated, m_messagingProxy)); |
| 101 } | 101 } |
| 102 | 102 |
| 103 WorkerObjectProxy::WorkerObjectProxy(ExecutionContext* executionContext, WorkerM
essagingProxy* messagingProxy) | 103 WorkerObjectProxy::WorkerObjectProxy(ExecutionContext* executionContext, WorkerM
essagingProxy* messagingProxy) |
| 104 : m_executionContext(executionContext) | 104 : m_executionContext(executionContext) |
| 105 , m_messagingProxy(messagingProxy) | 105 , m_messagingProxy(messagingProxy) |
| 106 { | 106 { |
| 107 } | 107 } |
| 108 | 108 |
| 109 } // namespace blink | 109 } // namespace blink |
| OLD | NEW |