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

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

Issue 121113004: Improve handling of failed integer type conversions. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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
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 #if ENABLE(WEB_AUDIO) 26 #if ENABLE(WEB_AUDIO)
27 #include "V8OscillatorNode.h" 27 #include "V8OscillatorNode.h"
28 28
29 #include "bindings/v8/ExceptionState.h"
29 #include "bindings/v8/V8Binding.h" 30 #include "bindings/v8/V8Binding.h"
30 #include "modules/webaudio/OscillatorNode.h" 31 #include "modules/webaudio/OscillatorNode.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 void V8OscillatorNode::typeAttributeSetterCustom(v8::Local<v8::Value> value, con st v8::PropertyCallbackInfo<void>& info) 35 void V8OscillatorNode::typeAttributeSetterCustom(v8::Local<v8::Value> value, con st v8::PropertyCallbackInfo<void>& info)
35 { 36 {
37 ExceptionState exceptionState(ExceptionState::SetterContext, "type", "Oscill atorNode", info.Holder(), info.GetIsolate());
36 v8::Handle<v8::Object> holder = info.Holder(); 38 v8::Handle<v8::Object> holder = info.Holder();
37 OscillatorNode* imp = V8OscillatorNode::toNative(holder); 39 OscillatorNode* imp = V8OscillatorNode::toNative(holder);
38 40
39 if (value->IsNumber()) { 41 if (value->IsNumber()) {
40 bool ok = false; 42 uint32_t type = toUInt32(value, exceptionState);
41 uint32_t type = toUInt32(value, ok); 43 if (exceptionState.throwIfNeeded())
42 if (!ok || !imp->setType(type)) 44 return;
43 throwTypeError("Illegal OscillatorNode type", info.GetIsolate()); 45 if (!imp->setType(type)) {
46 exceptionState.throwTypeError("Illegal OscillatorNode type");
47 exceptionState.throwIfNeeded();
48 }
44 return; 49 return;
45 } 50 }
46 51
47 if (value->IsString()) { 52 if (value->IsString()) {
48 String type = toCoreString(value.As<v8::String>()); 53 String type = toCoreString(value.As<v8::String>());
49 if (type == "sine" || type == "square" || type == "sawtooth" || type == "triangle") { 54 if (type == "sine" || type == "square" || type == "sawtooth" || type == "triangle") {
50 imp->setType(type); 55 imp->setType(type);
51 return; 56 return;
52 } 57 }
53 } 58 }
54 59
55 throwTypeError("Illegal OscillatorNode type", info.GetIsolate()); 60 exceptionState.throwTypeError("Illegal OscillatorNode type");
61 exceptionState.throwIfNeeded();
56 } 62 }
57 63
58 } // namespace WebCore 64 } // namespace WebCore
59 65
60 #endif // ENABLE(WEB_AUDIO) 66 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp ('k') | Source/bindings/v8/custom/V8PannerNodeCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698