Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Side by Side Diff: Source/bindings/core/v8/ExceptionState.cpp

Issue 232563003: API functions returning Promises should not throw exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/bindings/core/v8/ExceptionState.h ('k') | Source/bindings/core/v8/ScriptPromise.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 void ExceptionState::clearException() 40 void ExceptionState::clearException()
41 { 41 {
42 m_code = 0; 42 m_code = 0;
43 m_exception.clear(); 43 m_exception.clear();
44 } 44 }
45 45
46 ScriptPromise ExceptionState::reject(ScriptState* scriptState)
47 {
48 ScriptPromise promise = ScriptPromise::reject(scriptState, m_exception.newLo cal(scriptState->isolate()));
49 clearException();
50 return promise;
51 }
52
46 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& me ssage) 53 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& me ssage)
47 { 54 {
48 ASSERT(ec); 55 ASSERT(ec);
49 ASSERT(m_isolate); 56 ASSERT(m_isolate);
50 ASSERT(!m_creationContext.IsEmpty()); 57 ASSERT(!m_creationContext.IsEmpty());
51 58
52 // SecurityError is thrown via ::throwSecurityError, and _careful_ considera tion must be given to the data exposed to JavaScript via the 'sanitizedMessage'. 59 // SecurityError is thrown via ::throwSecurityError, and _careful_ considera tion must be given to the data exposed to JavaScript via the 'sanitizedMessage'.
53 ASSERT(ec != SecurityError); 60 ASSERT(ec != SecurityError);
54 61
55 m_code = ec; 62 m_code = ec;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 processedMessage = ExceptionMessages::failedToDeleteIndexed(interfac eName(), message); 186 processedMessage = ExceptionMessages::failedToDeleteIndexed(interfac eName(), message);
180 else if (m_context == IndexedGetterContext) 187 else if (m_context == IndexedGetterContext)
181 processedMessage = ExceptionMessages::failedToGetIndexed(interfaceNa me(), message); 188 processedMessage = ExceptionMessages::failedToGetIndexed(interfaceNa me(), message);
182 else if (m_context == IndexedSetterContext) 189 else if (m_context == IndexedSetterContext)
183 processedMessage = ExceptionMessages::failedToSetIndexed(interfaceNa me(), message); 190 processedMessage = ExceptionMessages::failedToSetIndexed(interfaceNa me(), message);
184 } 191 }
185 return processedMessage; 192 return processedMessage;
186 } 193 }
187 194
188 } // namespace blink 195 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ExceptionState.h ('k') | Source/bindings/core/v8/ScriptPromise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698