| 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 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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/ScriptCallStack.h" | 37 #include "core/inspector/ScriptCallStack.h" |
| 37 #include "core/frame/LocalDOMWindow.h" | 38 #include "core/frame/LocalDOMWindow.h" |
| 38 #include "core/workers/SharedWorkerThread.h" | 39 #include "core/workers/SharedWorkerThread.h" |
| 39 #include "core/workers/WorkerClients.h" | 40 #include "core/workers/WorkerClients.h" |
| 40 #include "wtf/CurrentTime.h" | 41 #include "wtf/CurrentTime.h" |
| 41 | 42 |
| 42 namespace blink { | 43 namespace blink { |
| 43 | 44 |
| 44 PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<M
essagePort> prpPort) | 45 PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<M
essagePort> prpPort) |
| 45 { | 46 { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 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,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPt
r<ScriptCallStack> callStack) | 82 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPt
r<ScriptCallStack> callStack) |
| 82 { | 83 { |
| 83 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); | 84 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); |
| 84 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack, 0); | 85 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSour
ce, ErrorMessageLevel, errorMessage, sourceURL, lineNumber); |
| 86 consoleMessage->setCallStack(callStack); |
| 87 addMessageToWorkerConsole(consoleMessage.release()); |
| 85 } | 88 } |
| 86 | 89 |
| 87 void SharedWorkerGlobalScope::trace(Visitor* visitor) | 90 void SharedWorkerGlobalScope::trace(Visitor* visitor) |
| 88 { | 91 { |
| 89 WorkerGlobalScope::trace(visitor); | 92 WorkerGlobalScope::trace(visitor); |
| 90 } | 93 } |
| 91 | 94 |
| 92 } // namespace blink | 95 } // namespace blink |
| OLD | NEW |