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

Side by Side Diff: Source/modules/crypto/Crypto.cpp

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/crypto/Crypto.h ('k') | Source/modules/crypto/CryptoOperation.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "modules/crypto/Crypto.h" 31 #include "modules/crypto/Crypto.h"
32 32
33 #include "bindings/v8/ExceptionState.h"
34 #include "core/dom/ExceptionCode.h" 33 #include "core/dom/ExceptionCode.h"
35 #include "wtf/ArrayBufferView.h" 34 #include "wtf/ArrayBufferView.h"
36 #include "wtf/CryptographicallyRandomNumber.h" 35 #include "wtf/CryptographicallyRandomNumber.h"
37 36
38 namespace WebCore { 37 namespace WebCore {
39 38
40 namespace { 39 namespace {
41 40
42 bool isIntegerArray(ArrayBufferView* array) 41 bool isIntegerArray(ArrayBufferView* array)
43 { 42 {
44 ArrayBufferView::ViewType type = array->getType(); 43 ArrayBufferView::ViewType type = array->getType();
45 return type == ArrayBufferView::TypeInt8 44 return type == ArrayBufferView::TypeInt8
46 || type == ArrayBufferView::TypeUint8 45 || type == ArrayBufferView::TypeUint8
47 || type == ArrayBufferView::TypeUint8Clamped 46 || type == ArrayBufferView::TypeUint8Clamped
48 || type == ArrayBufferView::TypeInt16 47 || type == ArrayBufferView::TypeInt16
49 || type == ArrayBufferView::TypeUint16 48 || type == ArrayBufferView::TypeUint16
50 || type == ArrayBufferView::TypeInt32 49 || type == ArrayBufferView::TypeInt32
51 || type == ArrayBufferView::TypeUint32; 50 || type == ArrayBufferView::TypeUint32;
52 } 51 }
53 52
54 } 53 }
55 54
56 Crypto::Crypto() 55 Crypto::Crypto()
57 { 56 {
58 ScriptWrappable::init(this); 57 ScriptWrappable::init(this);
59 } 58 }
60 59
61 // Note: This implementation must be thread-safe, as it is used by workers. 60 // Note: This implementation must be thread-safe, as it is used by workers.
62 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionState& es) 61 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
63 { 62 {
64 if (!array || !isIntegerArray(array)) { 63 if (!array || !isIntegerArray(array)) {
65 es.throwDOMException(TypeMismatchError); 64 ec = TypeMismatchError;
66 return; 65 return;
67 } 66 }
68 if (array->byteLength() > 65536) { 67 if (array->byteLength() > 65536) {
69 es.throwDOMException(QuotaExceededError); 68 ec = QuotaExceededError;
70 return; 69 return;
71 } 70 }
72 cryptographicallyRandomValues(array->baseAddress(), array->byteLength()); 71 cryptographicallyRandomValues(array->baseAddress(), array->byteLength());
73 } 72 }
74 73
75 SubtleCrypto* Crypto::subtle() 74 SubtleCrypto* Crypto::subtle()
76 { 75 {
77 if (!m_subtleCrypto) 76 if (!m_subtleCrypto)
78 m_subtleCrypto = SubtleCrypto::create(); 77 m_subtleCrypto = SubtleCrypto::create();
79 return m_subtleCrypto.get(); 78 return m_subtleCrypto.get();
80 } 79 }
81 80
82 } 81 }
OLDNEW
« no previous file with comments | « Source/modules/crypto/Crypto.h ('k') | Source/modules/crypto/CryptoOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698