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

Side by Side Diff: Source/bindings/v8/custom/V8CryptoCustom.cpp

Issue 105693002: Generate a bit less code to handle failed arity checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years 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
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 "bindings/v8/ExceptionMessages.h"
29 #include "bindings/v8/ExceptionState.h" 28 #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"
32 #include "bindings/v8/custom/V8ArrayBufferViewCustom.h" 31 #include "bindings/v8/custom/V8ArrayBufferViewCustom.h"
33 #include "core/dom/ExceptionCode.h" 32 #include "core/dom/ExceptionCode.h"
34 #include "modules/crypto/Crypto.h" 33 #include "modules/crypto/Crypto.h"
35 #include "wtf/ArrayBufferView.h" 34 #include "wtf/ArrayBufferView.h"
36 35
37 namespace WebCore { 36 namespace WebCore {
38 37
39 // This custom binding is shared by V8WorkerCrypto. As such: 38 // This custom binding is shared by V8WorkerCrypto. As such:
40 // * Do not call V8Crypto::toNative() 39 // * Do not call V8Crypto::toNative()
41 // * Must be threadsafe 40 // * Must be threadsafe
42 void V8Crypto::getRandomValuesMethodCustom(const v8::FunctionCallbackInfo<v8::Va lue>& info) 41 void V8Crypto::getRandomValuesMethodCustom(const v8::FunctionCallbackInfo<v8::Va lue>& info)
43 { 42 {
43 ExceptionState exceptionState(ExceptionState::ExecutionContext, "getRandomVa lues", "Crypto", info.Holder(), info.GetIsolate());
Mike West 2013/12/05 11:48:59 These custom bindings changes look reasonable, tha
44 if (info.Length() < 1) { 44 if (info.Length() < 1) {
45 throwTypeError(ExceptionMessages::failedToExecute("getRandomValues", "Cr ypto", ExceptionMessages::notEnoughArguments(1, info.Length())), info.GetIsolate ()); 45 exceptionState.notEnoughArguments(1, info.Length());
46 return; 46 return;
47 } 47 }
48 48
49 v8::Handle<v8::Value> buffer = info[0]; 49 v8::Handle<v8::Value> buffer = info[0];
50 if (!V8ArrayBufferView::hasInstance(buffer, info.GetIsolate(), worldType(inf o.GetIsolate()))) { 50 if (!V8ArrayBufferView::hasInstance(buffer, info.GetIsolate(), worldType(inf o.GetIsolate()))) {
51 throwTypeError("First argument is not an ArrayBufferView", info.GetIsola te()); 51 exceptionState.throwTypeError("First argument is not an ArrayBufferView" );
52 return; 52 } else {
53 ArrayBufferView* arrayBufferView = V8ArrayBufferView::toNative(v8::Handl e<v8::Object>::Cast(buffer));
54 ASSERT(arrayBufferView);
55
56 Crypto::getRandomValues(arrayBufferView, exceptionState);
53 } 57 }
54 58
55 ArrayBufferView* arrayBufferView = V8ArrayBufferView::toNative(v8::Handle<v8 ::Object>::Cast(buffer));
56 ASSERT(arrayBufferView);
57
58 ExceptionState exceptionState(ExceptionState::ExecutionContext, "getRandomVa lues", "Crypto", info.Holder(), info.GetIsolate());
59 Crypto::getRandomValues(arrayBufferView, exceptionState);
60
61 if (exceptionState.throwIfNeeded()) 59 if (exceptionState.throwIfNeeded())
62 return; 60 return;
63 61
64 v8SetReturnValue(info, buffer); 62 v8SetReturnValue(info, buffer);
65 } 63 }
66 64
67 } // namespace WebCore 65 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698