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 14 matching lines...) Expand all Loading... |
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 "config.h" | 31 #include "config.h" |
32 #include "bindings/core/v8/ExceptionState.h" | 32 #include "bindings/core/v8/ExceptionState.h" |
33 | 33 |
34 #include "bindings/core/v8/ExceptionMessages.h" | 34 #include "bindings/core/v8/ExceptionMessages.h" |
| 35 #include "bindings/core/v8/ScriptPromiseResolver.h" |
35 #include "bindings/core/v8/V8ThrowException.h" | 36 #include "bindings/core/v8/V8ThrowException.h" |
36 #include "core/dom/ExceptionCode.h" | 37 #include "core/dom/ExceptionCode.h" |
37 | 38 |
38 namespace blink { | 39 namespace blink { |
39 | 40 |
40 void ExceptionState::clearException() | 41 void ExceptionState::clearException() |
41 { | 42 { |
42 m_code = 0; | 43 m_code = 0; |
43 m_exception.clear(); | 44 m_exception.clear(); |
44 } | 45 } |
45 | 46 |
46 ScriptPromise ExceptionState::reject(ScriptState* scriptState) | 47 ScriptPromise ExceptionState::reject(ScriptState* scriptState) |
47 { | 48 { |
48 ScriptPromise promise = ScriptPromise::reject(scriptState, m_exception.newLo
cal(scriptState->isolate())); | 49 ScriptPromise promise = ScriptPromise::reject(scriptState, m_exception.newLo
cal(scriptState->isolate())); |
49 clearException(); | 50 clearException(); |
50 return promise; | 51 return promise; |
51 } | 52 } |
52 | 53 |
| 54 void ExceptionState::reject(ScriptPromiseResolver* resolver) |
| 55 { |
| 56 resolver->reject(m_exception.newLocal(resolver->scriptState()->isolate())); |
| 57 clearException(); |
| 58 } |
| 59 |
53 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& me
ssage) | 60 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& me
ssage) |
54 { | 61 { |
55 ASSERT(ec); | 62 ASSERT(ec); |
56 ASSERT(m_isolate); | 63 ASSERT(m_isolate); |
57 ASSERT(!m_creationContext.IsEmpty()); | 64 ASSERT(!m_creationContext.IsEmpty()); |
58 | 65 |
59 // SecurityError is thrown via ::throwSecurityError, and _careful_ considera
tion must be given to the data exposed to JavaScript via the 'sanitizedMessage'. | 66 // SecurityError is thrown via ::throwSecurityError, and _careful_ considera
tion must be given to the data exposed to JavaScript via the 'sanitizedMessage'. |
60 ASSERT(ec != SecurityError); | 67 ASSERT(ec != SecurityError); |
61 | 68 |
62 m_code = ec; | 69 m_code = ec; |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 processedMessage = ExceptionMessages::failedToDeleteIndexed(interfac
eName(), message); | 193 processedMessage = ExceptionMessages::failedToDeleteIndexed(interfac
eName(), message); |
187 else if (m_context == IndexedGetterContext) | 194 else if (m_context == IndexedGetterContext) |
188 processedMessage = ExceptionMessages::failedToGetIndexed(interfaceNa
me(), message); | 195 processedMessage = ExceptionMessages::failedToGetIndexed(interfaceNa
me(), message); |
189 else if (m_context == IndexedSetterContext) | 196 else if (m_context == IndexedSetterContext) |
190 processedMessage = ExceptionMessages::failedToSetIndexed(interfaceNa
me(), message); | 197 processedMessage = ExceptionMessages::failedToSetIndexed(interfaceNa
me(), message); |
191 } | 198 } |
192 return processedMessage; | 199 return processedMessage; |
193 } | 200 } |
194 | 201 |
195 } // namespace blink | 202 } // namespace blink |
OLD | NEW |