| 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 "core/workers/SharedWorkerGlobalScope.h" | 31 #include "core/workers/SharedWorkerGlobalScope.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptCallStack.h" | 33 #include "bindings/core/v8/SourceLocation.h" |
| 34 #include "core/events/MessageEvent.h" | 34 #include "core/events/MessageEvent.h" |
| 35 #include "core/inspector/ConsoleMessage.h" | 35 #include "core/inspector/ConsoleMessage.h" |
| 36 #include "core/frame/LocalDOMWindow.h" | 36 #include "core/frame/LocalDOMWindow.h" |
| 37 #include "core/origin_trials/OriginTrialContext.h" | 37 #include "core/origin_trials/OriginTrialContext.h" |
| 38 #include "core/workers/SharedWorkerThread.h" | 38 #include "core/workers/SharedWorkerThread.h" |
| 39 #include "core/workers/WorkerClients.h" | 39 #include "core/workers/WorkerClients.h" |
| 40 #include "wtf/CurrentTime.h" | 40 #include "wtf/CurrentTime.h" |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 73 const AtomicString& SharedWorkerGlobalScope::interfaceName() const | 73 const AtomicString& SharedWorkerGlobalScope::interfaceName() const |
| 74 { | 74 { |
| 75 return EventTargetNames::SharedWorkerGlobalScope; | 75 return EventTargetNames::SharedWorkerGlobalScope; |
| 76 } | 76 } |
| 77 | 77 |
| 78 SharedWorkerThread* SharedWorkerGlobalScope::thread() | 78 SharedWorkerThread* SharedWorkerGlobalScope::thread() |
| 79 { | 79 { |
| 80 return static_cast<SharedWorkerThread*>(Base::thread()); | 80 return static_cast<SharedWorkerThread*>(Base::thread()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRef
Ptr<ScriptCallStack> callStack) | 83 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
PassOwnPtr<SourceLocation> location) |
| 84 { | 84 { |
| 85 WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL,
lineNumber, columnNumber, callStack); | 85 WorkerGlobalScope::logExceptionToConsole(errorMessage, location->clone()); |
| 86 ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, Err
orMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber, callStack, sc
riptId); | 86 ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, Err
orMessageLevel, errorMessage, std::move(location)); |
| 87 addMessageToWorkerConsole(consoleMessage); | 87 addMessageToWorkerConsole(consoleMessage); |
| 88 } | 88 } |
| 89 | 89 |
| 90 DEFINE_TRACE(SharedWorkerGlobalScope) | 90 DEFINE_TRACE(SharedWorkerGlobalScope) |
| 91 { | 91 { |
| 92 WorkerGlobalScope::trace(visitor); | 92 WorkerGlobalScope::trace(visitor); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace blink | 95 } // namespace blink |
| OLD | NEW |