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 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 #include "config.h" | 30 #include "config.h" |
31 #include "ServiceWorkerGlobalScope.h" | 31 #include "ServiceWorkerGlobalScope.h" |
32 | 32 |
33 #include "bindings/core/v8/ScriptPromise.h" | 33 #include "bindings/core/v8/ScriptPromise.h" |
34 #include "bindings/core/v8/ScriptState.h" | 34 #include "bindings/core/v8/ScriptState.h" |
35 #include "bindings/core/v8/V8ThrowException.h" | 35 #include "bindings/core/v8/V8ThrowException.h" |
| 36 #include "core/inspector/ConsoleMessage.h" |
36 #include "core/inspector/ScriptCallStack.h" | 37 #include "core/inspector/ScriptCallStack.h" |
37 #include "core/workers/WorkerClients.h" | 38 #include "core/workers/WorkerClients.h" |
38 #include "core/workers/WorkerThreadStartupData.h" | 39 #include "core/workers/WorkerThreadStartupData.h" |
39 #include "modules/CachePolyfill.h" | 40 #include "modules/CachePolyfill.h" |
40 #include "modules/CacheStoragePolyfill.h" | 41 #include "modules/CacheStoragePolyfill.h" |
41 #include "modules/EventTargetModules.h" | 42 #include "modules/EventTargetModules.h" |
42 #include "modules/FetchPolyfill.h" | 43 #include "modules/FetchPolyfill.h" |
43 #include "modules/serviceworkers/FetchManager.h" | 44 #include "modules/serviceworkers/FetchManager.h" |
44 #include "modules/serviceworkers/Request.h" | 45 #include "modules/serviceworkers/Request.h" |
45 #include "modules/serviceworkers/ServiceWorkerClients.h" | 46 #include "modules/serviceworkers/ServiceWorkerClients.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const | 113 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const |
113 { | 114 { |
114 return EventTargetNames::ServiceWorkerGlobalScope; | 115 return EventTargetNames::ServiceWorkerGlobalScope; |
115 } | 116 } |
116 | 117 |
117 void ServiceWorkerGlobalScope::trace(Visitor* visitor) | 118 void ServiceWorkerGlobalScope::trace(Visitor* visitor) |
118 { | 119 { |
119 WorkerGlobalScope::trace(visitor); | 120 WorkerGlobalScope::trace(visitor); |
120 } | 121 } |
121 | 122 |
122 void ServiceWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawP
tr<ScriptCallStack> callStack) | 123 void ServiceWorkerGlobalScope::logExceptionToConsole(PassRefPtrWillBeRawPtr<Cons
oleMessage> prpMessage) |
123 { | 124 { |
124 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); | 125 RefPtr<ConsoleMessage> message = prpMessage; |
125 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack, 0); | 126 WorkerGlobalScope::logExceptionToConsole(message); |
| 127 addMessageToWorkerConsole(message.release()); |
126 } | 128 } |
127 | 129 |
128 } // namespace WebCore | 130 } // namespace WebCore |
OLD | NEW |