| 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 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/workers/WorkerObjectProxy.h" | 32 #include "core/workers/WorkerObjectProxy.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/SerializedScriptValue.h" | 34 #include "bindings/core/v8/SerializedScriptValue.h" |
| 35 #include "core/dom/CrossThreadTask.h" | 35 #include "core/dom/CrossThreadTask.h" |
| 36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 37 #include "core/dom/ExecutionContext.h" | 37 #include "core/dom/ExecutionContext.h" |
| 38 #include "core/inspector/ConsoleMessage.h" |
| 38 #include "core/workers/WorkerMessagingProxy.h" | 39 #include "core/workers/WorkerMessagingProxy.h" |
| 39 #include "platform/NotImplemented.h" | 40 #include "platform/NotImplemented.h" |
| 40 #include "wtf/Functional.h" | 41 #include "wtf/Functional.h" |
| 41 | 42 |
| 42 namespace blink { | 43 namespace blink { |
| 43 | 44 |
| 44 PassOwnPtr<WorkerObjectProxy> WorkerObjectProxy::create(ExecutionContext* execut
ionContext, WorkerMessagingProxy* messagingProxy) | 45 PassOwnPtr<WorkerObjectProxy> WorkerObjectProxy::create(ExecutionContext* execut
ionContext, WorkerMessagingProxy* messagingProxy) |
| 45 { | 46 { |
| 46 return adoptPtr(new WorkerObjectProxy(executionContext, messagingProxy)); | 47 return adoptPtr(new WorkerObjectProxy(executionContext, messagingProxy)); |
| 47 } | 48 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 64 void WorkerObjectProxy::reportPendingActivity(bool hasPendingActivity) | 65 void WorkerObjectProxy::reportPendingActivity(bool hasPendingActivity) |
| 65 { | 66 { |
| 66 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portPendingActivity, m_messagingProxy, hasPendingActivity)); | 67 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portPendingActivity, m_messagingProxy, hasPendingActivity)); |
| 67 } | 68 } |
| 68 | 69 |
| 69 void WorkerObjectProxy::reportException(const String& errorMessage, int lineNumb
er, int columnNumber, const String& sourceURL) | 70 void WorkerObjectProxy::reportException(const String& errorMessage, int lineNumb
er, int columnNumber, const String& sourceURL) |
| 70 { | 71 { |
| 71 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portException, m_messagingProxy, errorMessage, lineNumber, columnNumber, sourceU
RL)); | 72 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portException, m_messagingProxy, errorMessage, lineNumber, columnNumber, sourceU
RL)); |
| 72 } | 73 } |
| 73 | 74 |
| 74 void WorkerObjectProxy::reportConsoleMessage(MessageSource source, MessageLevel
level, const String& message, int lineNumber, const String& sourceURL) | 75 void WorkerObjectProxy::reportConsoleMessage(PassRefPtr<ConsoleMessage> consoleM
essage) |
| 75 { | 76 { |
| 76 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portConsoleMessage, m_messagingProxy, source, level, message, lineNumber, source
URL)); | 77 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::re
portConsoleMessage, m_messagingProxy, consoleMessage->source(), consoleMessage->
level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage
->url())); |
| 77 } | 78 } |
| 78 | 79 |
| 79 void WorkerObjectProxy::postMessageToPageInspector(const String& message) | 80 void WorkerObjectProxy::postMessageToPageInspector(const String& message) |
| 80 { | 81 { |
| 81 if (m_executionContext->isDocument()) | 82 if (m_executionContext->isDocument()) |
| 82 toDocument(m_executionContext)->postInspectorTask(createCrossThreadTask(
&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy, message)); | 83 toDocument(m_executionContext)->postInspectorTask(createCrossThreadTask(
&WorkerMessagingProxy::postMessageToPageInspector, m_messagingProxy, message)); |
| 83 } | 84 } |
| 84 | 85 |
| 85 void WorkerObjectProxy::updateInspectorStateCookie(const String&) | 86 void WorkerObjectProxy::updateInspectorStateCookie(const String&) |
| 86 { | 87 { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 98 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::wo
rkerGlobalScopeDestroyed, m_messagingProxy)); | 99 m_executionContext->postTask(createCrossThreadTask(&WorkerMessagingProxy::wo
rkerGlobalScopeDestroyed, m_messagingProxy)); |
| 99 } | 100 } |
| 100 | 101 |
| 101 WorkerObjectProxy::WorkerObjectProxy(ExecutionContext* executionContext, WorkerM
essagingProxy* messagingProxy) | 102 WorkerObjectProxy::WorkerObjectProxy(ExecutionContext* executionContext, WorkerM
essagingProxy* messagingProxy) |
| 102 : m_executionContext(executionContext) | 103 : m_executionContext(executionContext) |
| 103 , m_messagingProxy(messagingProxy) | 104 , m_messagingProxy(messagingProxy) |
| 104 { | 105 { |
| 105 } | 106 } |
| 106 | 107 |
| 107 } // namespace blink | 108 } // namespace blink |
| OLD | NEW |