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

Side by Side Diff: Source/modules/webaudio/WaveShaperNode.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
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 * 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
(...skipping 10 matching lines...) Expand all
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 26
27 #if ENABLE(WEB_AUDIO) 27 #if ENABLE(WEB_AUDIO)
28 28
29 #include "modules/webaudio/WaveShaperNode.h" 29 #include "modules/webaudio/WaveShaperNode.h"
30 30
31 #include "bindings/v8/ExceptionState.h"
32 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
33 #include "wtf/MainThread.h" 32 #include "wtf/MainThread.h"
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 WaveShaperNode::WaveShaperNode(AudioContext* context) 36 WaveShaperNode::WaveShaperNode(AudioContext* context)
38 : AudioBasicProcessorNode(context, context->sampleRate()) 37 : AudioBasicProcessorNode(context, context->sampleRate())
39 { 38 {
40 ScriptWrappable::init(this); 39 ScriptWrappable::init(this);
41 m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1)); 40 m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1));
42 setNodeType(NodeTypeWaveShaper); 41 setNodeType(NodeTypeWaveShaper);
43 42
44 initialize(); 43 initialize();
45 } 44 }
46 45
47 void WaveShaperNode::setCurve(Float32Array* curve) 46 void WaveShaperNode::setCurve(Float32Array* curve)
48 { 47 {
49 ASSERT(isMainThread()); 48 ASSERT(isMainThread());
50 waveShaperProcessor()->setCurve(curve); 49 waveShaperProcessor()->setCurve(curve);
51 } 50 }
52 51
53 Float32Array* WaveShaperNode::curve() 52 Float32Array* WaveShaperNode::curve()
54 { 53 {
55 return waveShaperProcessor()->curve(); 54 return waveShaperProcessor()->curve();
56 } 55 }
57 56
58 void WaveShaperNode::setOversample(const String& type, ExceptionState& es) 57 void WaveShaperNode::setOversample(const String& type, ExceptionCode& ec)
59 { 58 {
60 ASSERT(isMainThread()); 59 ASSERT(isMainThread());
61 60
62 // This is to synchronize with the changes made in 61 // This is to synchronize with the changes made in
63 // AudioBasicProcessorNode::checkNumberOfChannelsForInput() where we can 62 // AudioBasicProcessorNode::checkNumberOfChannelsForInput() where we can
64 // initialize() and uninitialize(). 63 // initialize() and uninitialize().
65 AudioContext::AutoLocker contextLocker(context()); 64 AudioContext::AutoLocker contextLocker(context());
66 65
67 if (type == "none") 66 if (type == "none")
68 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone ); 67 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone );
69 else if (type == "2x") 68 else if (type == "2x")
70 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample2x); 69 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample2x);
71 else if (type == "4x") 70 else if (type == "4x")
72 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x); 71 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x);
73 else 72 else
74 es.throwDOMException(InvalidStateError); 73 ec = InvalidStateError;
75 } 74 }
76 75
77 String WaveShaperNode::oversample() const 76 String WaveShaperNode::oversample() const
78 { 77 {
79 switch (const_cast<WaveShaperNode*>(this)->waveShaperProcessor()->oversample ()) { 78 switch (const_cast<WaveShaperNode*>(this)->waveShaperProcessor()->oversample ()) {
80 case WaveShaperProcessor::OverSampleNone: 79 case WaveShaperProcessor::OverSampleNone:
81 return "none"; 80 return "none";
82 case WaveShaperProcessor::OverSample2x: 81 case WaveShaperProcessor::OverSample2x:
83 return "2x"; 82 return "2x";
84 case WaveShaperProcessor::OverSample4x: 83 case WaveShaperProcessor::OverSample4x:
85 return "4x"; 84 return "4x";
86 default: 85 default:
87 ASSERT_NOT_REACHED(); 86 ASSERT_NOT_REACHED();
88 return "none"; 87 return "none";
89 } 88 }
90 } 89 }
91 90
92 } // namespace WebCore 91 } // namespace WebCore
93 92
94 #endif // ENABLE(WEB_AUDIO) 93 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/WaveShaperNode.h ('k') | Source/modules/webdatabase/DOMWindowWebDatabase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698