OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "bindings/core/v8/RejectedPromises.h" | 6 #include "bindings/core/v8/RejectedPromises.h" |
7 | 7 |
8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
9 #include "bindings/core/v8/ScriptValue.h" | 9 #include "bindings/core/v8/ScriptValue.h" |
10 #include "bindings/core/v8/V8Binding.h" | 10 #include "bindings/core/v8/V8Binding.h" |
11 #include "core/dom/ExecutionContext.h" | 11 #include "core/dom/ExecutionContext.h" |
12 #include "core/inspector/ConsoleMessage.h" | 12 #include "core/inspector/ConsoleMessage.h" |
13 #include "core/inspector/ScriptArguments.h" | 13 #include "core/inspector/ScriptArguments.h" |
14 | 14 |
15 namespace blink { | 15 namespace blink { |
16 | 16 |
17 class RejectedPromises::Message final : public NoBaseWillBeGarbageCollectedFinal
ized<RejectedPromises::Message> { | 17 class RejectedPromises::Message final : public NoBaseWillBeGarbageCollectedFinal
ized<RejectedPromises::Message> { |
18 public: | 18 public: |
19 static PassOwnPtrWillBeRawPtr<Message> create(const ScriptValue& promise, co
nst ScriptValue& exception, const String& errorMessage, const String& resourceNa
me, int scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<Scrip
tCallStack> callStack) | 19 static PassOwnPtrWillBeRawPtr<Message> create(const ScriptValue& promise, co
nst ScriptValue& exception, const String& errorMessage, const String& resourceNa
me, int scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<Scrip
tCallStack> callStack) |
20 { | 20 { |
21 return adoptPtrWillBeNoop(new Message(promise, exception, errorMessage,
resourceName, scriptId, lineNumber, columnNumber, callStack)); | 21 return adoptPtrWillBeNoop(new Message(promise, exception, errorMessage,
resourceName, scriptId, lineNumber, columnNumber, callStack)); |
22 } | 22 } |
23 | 23 |
24 void trace(Visitor* visitor) | 24 DEFINE_INLINE_TRACE() |
25 { | 25 { |
26 visitor->trace(m_callStack); | 26 visitor->trace(m_callStack); |
27 } | 27 } |
28 | 28 |
29 private: | 29 private: |
30 Message(const ScriptValue& promise, const ScriptValue& exception, const Stri
ng& errorMessage, const String& resourceName, int scriptId, int lineNumber, int
columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack) | 30 Message(const ScriptValue& promise, const ScriptValue& exception, const Stri
ng& errorMessage, const String& resourceName, int scriptId, int lineNumber, int
columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack) |
31 : m_promise(promise) | 31 : m_promise(promise) |
32 , m_exception(exception) | 32 , m_exception(exception) |
33 , m_errorMessage(errorMessage) | 33 , m_errorMessage(errorMessage) |
34 , m_resourceName(resourceName) | 34 , m_resourceName(resourceName) |
(...skipping 15 matching lines...) Expand all Loading... |
50 const int m_columnNumber; | 50 const int m_columnNumber; |
51 const RefPtrWillBeMember<ScriptCallStack> m_callStack; | 51 const RefPtrWillBeMember<ScriptCallStack> m_callStack; |
52 }; | 52 }; |
53 | 53 |
54 RejectedPromises::RejectedPromises() | 54 RejectedPromises::RejectedPromises() |
55 { | 55 { |
56 } | 56 } |
57 | 57 |
58 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RejectedPromises); | 58 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RejectedPromises); |
59 | 59 |
60 void RejectedPromises::trace(Visitor* visitor) | 60 DEFINE_TRACE(RejectedPromises) |
61 { | 61 { |
62 visitor->trace(m_queue); | 62 visitor->trace(m_queue); |
63 } | 63 } |
64 | 64 |
65 void RejectedPromises::add(ScriptState* scriptState, v8::PromiseRejectMessage da
ta, const String& errorMessage, const String& resourceName, int scriptId, int li
neNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack) | 65 void RejectedPromises::add(ScriptState* scriptState, v8::PromiseRejectMessage da
ta, const String& errorMessage, const String& resourceName, int scriptId, int li
neNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack) |
66 { | 66 { |
67 v8::Handle<v8::Promise> promise = data.GetPromise(); | 67 v8::Handle<v8::Promise> promise = data.GetPromise(); |
68 OwnPtrWillBeRawPtr<Message> message = Message::create(ScriptValue(scriptStat
e, promise), ScriptValue(scriptState, data.GetValue()), errorMessage, resourceNa
me, scriptId, lineNumber, columnNumber, callStack); | 68 OwnPtrWillBeRawPtr<Message> message = Message::create(ScriptValue(scriptStat
e, promise), ScriptValue(scriptState, data.GetValue()), errorMessage, resourceNa
me, scriptId, lineNumber, columnNumber, callStack); |
69 | 69 |
70 m_queue.append(message.release()); | 70 m_queue.append(message.release()); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 | 113 |
114 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::crea
te(JSMessageSource, ErrorMessageLevel, embedderErrorMessage, message->m_resource
Name, message->m_lineNumber, message->m_columnNumber); | 114 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::crea
te(JSMessageSource, ErrorMessageLevel, embedderErrorMessage, message->m_resource
Name, message->m_lineNumber, message->m_columnNumber); |
115 consoleMessage->setScriptArguments(arguments); | 115 consoleMessage->setScriptArguments(arguments); |
116 consoleMessage->setCallStack(message->m_callStack); | 116 consoleMessage->setCallStack(message->m_callStack); |
117 consoleMessage->setScriptId(message->m_scriptId); | 117 consoleMessage->setScriptId(message->m_scriptId); |
118 executionContext->addConsoleMessage(consoleMessage.release()); | 118 executionContext->addConsoleMessage(consoleMessage.release()); |
119 } | 119 } |
120 } | 120 } |
121 | 121 |
122 } // namespace blink | 122 } // namespace blink |
OLD | NEW |