| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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 | 32 |
| 33 #include "core/workers/SharedWorkerGlobalScope.h" | 33 #include "core/workers/SharedWorkerGlobalScope.h" |
| 34 | 34 |
| 35 #include "core/events/MessageEvent.h" | 35 #include "core/events/MessageEvent.h" |
| 36 #include "core/inspector/ConsoleMessage.h" | 36 #include "core/inspector/ConsoleMessage.h" |
| 37 #include "core/inspector/ScriptArguments.h" |
| 37 #include "core/inspector/ScriptCallStack.h" | 38 #include "core/inspector/ScriptCallStack.h" |
| 38 #include "core/frame/LocalDOMWindow.h" | 39 #include "core/frame/LocalDOMWindow.h" |
| 39 #include "core/workers/SharedWorkerThread.h" | 40 #include "core/workers/SharedWorkerThread.h" |
| 40 #include "core/workers/WorkerClients.h" | 41 #include "core/workers/WorkerClients.h" |
| 41 #include "wtf/CurrentTime.h" | 42 #include "wtf/CurrentTime.h" |
| 42 | 43 |
| 43 namespace blink { | 44 namespace blink { |
| 44 | 45 |
| 45 PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<M
essagePort> prpPort) | 46 PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<M
essagePort> prpPort) |
| 46 { | 47 { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 71 const AtomicString& SharedWorkerGlobalScope::interfaceName() const | 72 const AtomicString& SharedWorkerGlobalScope::interfaceName() const |
| 72 { | 73 { |
| 73 return EventTargetNames::SharedWorkerGlobalScope; | 74 return EventTargetNames::SharedWorkerGlobalScope; |
| 74 } | 75 } |
| 75 | 76 |
| 76 SharedWorkerThread* SharedWorkerGlobalScope::thread() | 77 SharedWorkerThread* SharedWorkerGlobalScope::thread() |
| 77 { | 78 { |
| 78 return static_cast<SharedWorkerThread*>(Base::thread()); | 79 return static_cast<SharedWorkerThread*>(Base::thread()); |
| 79 } | 80 } |
| 80 | 81 |
| 81 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRef
PtrWillBeRawPtr<ScriptCallStack> callStack) | 82 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRef
PtrWillBeRawPtr<ScriptCallStack> callStack, PassRefPtrWillBeRawPtr<ScriptArgumen
ts> arguments) |
| 82 { | 83 { |
| 83 WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL,
lineNumber, columnNumber, callStack); | 84 WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL,
lineNumber, columnNumber, callStack, arguments); |
| 84 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(J
SMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber); | 85 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(J
SMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber); |
| 85 consoleMessage->setScriptId(scriptId); | 86 consoleMessage->setScriptId(scriptId); |
| 86 consoleMessage->setCallStack(callStack); | 87 consoleMessage->setCallStack(callStack); |
| 88 consoleMessage->setScriptArguments(arguments); |
| 87 addMessageToWorkerConsole(consoleMessage.release()); | 89 addMessageToWorkerConsole(consoleMessage.release()); |
| 88 } | 90 } |
| 89 | 91 |
| 90 void SharedWorkerGlobalScope::trace(Visitor* visitor) | 92 void SharedWorkerGlobalScope::trace(Visitor* visitor) |
| 91 { | 93 { |
| 92 WorkerGlobalScope::trace(visitor); | 94 WorkerGlobalScope::trace(visitor); |
| 93 } | 95 } |
| 94 | 96 |
| 95 } // namespace blink | 97 } // namespace blink |
| OLD | NEW |