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

Side by Side Diff: Source/bindings/v8/custom/V8CryptoCustom.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 | « no previous file | Source/bindings/v8/custom/V8SQLTransactionCustom.cpp » ('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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "V8Crypto.h" 26 #include "V8Crypto.h"
27 27
28 #include "V8ArrayBufferView.h" 28 #include "V8ArrayBufferView.h"
29 #include "bindings/v8/ExceptionState.h"
30 #include "bindings/v8/V8Binding.h" 29 #include "bindings/v8/V8Binding.h"
31 #include "bindings/v8/V8Utilities.h" 30 #include "bindings/v8/V8Utilities.h"
31 #include "core/dom/ExceptionCode.h"
32 #include "modules/crypto/Crypto.h" 32 #include "modules/crypto/Crypto.h"
33 33
34 #include "wtf/ArrayBufferView.h" 34 #include "wtf/ArrayBufferView.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 // This custom binding is shared by V8WorkerCrypto. As such: 38 // This custom binding is shared by V8WorkerCrypto. As such:
39 // * Do not call V8Crypto::toNative() 39 // * Do not call V8Crypto::toNative()
40 // * Must be threadsafe 40 // * Must be threadsafe
41 void V8Crypto::getRandomValuesMethodCustom(const v8::FunctionCallbackInfo<v8::Va lue>& args) 41 void V8Crypto::getRandomValuesMethodCustom(const v8::FunctionCallbackInfo<v8::Va lue>& args)
42 { 42 {
43 if (args.Length() < 1) { 43 if (args.Length() < 1) {
44 throwNotEnoughArgumentsError(args.GetIsolate()); 44 throwNotEnoughArgumentsError(args.GetIsolate());
45 return; 45 return;
46 } 46 }
47 47
48 v8::Handle<v8::Value> buffer = args[0]; 48 v8::Handle<v8::Value> buffer = args[0];
49 if (!V8ArrayBufferView::HasInstance(buffer, args.GetIsolate(), worldType(arg s.GetIsolate()))) { 49 if (!V8ArrayBufferView::HasInstance(buffer, args.GetIsolate(), worldType(arg s.GetIsolate()))) {
50 throwTypeError("First argument is not an ArrayBufferView", args.GetIsola te()); 50 throwTypeError("First argument is not an ArrayBufferView", args.GetIsola te());
51 return; 51 return;
52 } 52 }
53 53
54 ArrayBufferView* arrayBufferView = V8ArrayBufferView::toNative(v8::Handle<v8 ::Object>::Cast(buffer)); 54 ArrayBufferView* arrayBufferView = V8ArrayBufferView::toNative(v8::Handle<v8 ::Object>::Cast(buffer));
55 ASSERT(arrayBufferView); 55 ASSERT(arrayBufferView);
56 56
57 ExceptionState es(args.GetIsolate()); 57 ExceptionCode ec = 0;
58 Crypto::getRandomValues(arrayBufferView, es); 58 Crypto::getRandomValues(arrayBufferView, ec);
59 59
60 if (es.throwIfNeeded()) 60 if (ec) {
61 setDOMException(ec, args.GetIsolate());
61 return; 62 return;
63 }
62 64
63 v8SetReturnValue(args, buffer); 65 v8SetReturnValue(args, buffer);
64 } 66 }
65 67
66 } // namespace WebCore 68 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/bindings/v8/custom/V8SQLTransactionCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698