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

Side by Side Diff: Source/modules/webaudio/WaveShaperNode.cpp

Issue 24877002: Add more informative messages for DOM exceptions. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Upload again Created 7 years, 2 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/webaudio/OfflineAudioContext.cpp ('k') | no next file » | 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 * 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/ExceptionMessages.h"
31 #include "bindings/v8/ExceptionState.h" 32 #include "bindings/v8/ExceptionState.h"
32 #include "core/dom/ExceptionCode.h" 33 #include "core/dom/ExceptionCode.h"
33 #include "wtf/MainThread.h" 34 #include "wtf/MainThread.h"
34 35
35 namespace WebCore { 36 namespace WebCore {
36 37
37 WaveShaperNode::WaveShaperNode(AudioContext* context) 38 WaveShaperNode::WaveShaperNode(AudioContext* context)
38 : AudioBasicProcessorNode(context, context->sampleRate()) 39 : AudioBasicProcessorNode(context, context->sampleRate())
39 { 40 {
40 ScriptWrappable::init(this); 41 ScriptWrappable::init(this);
(...skipping 16 matching lines...) Expand all
57 58
58 void WaveShaperNode::setOversample(const String& type, ExceptionState& es) 59 void WaveShaperNode::setOversample(const String& type, ExceptionState& es)
59 { 60 {
60 ASSERT(isMainThread()); 61 ASSERT(isMainThread());
61 62
62 // This is to synchronize with the changes made in 63 // This is to synchronize with the changes made in
63 // AudioBasicProcessorNode::checkNumberOfChannelsForInput() where we can 64 // AudioBasicProcessorNode::checkNumberOfChannelsForInput() where we can
64 // initialize() and uninitialize(). 65 // initialize() and uninitialize().
65 AudioContext::AutoLocker contextLocker(context()); 66 AudioContext::AutoLocker contextLocker(context());
66 67
67 if (type == "none") 68 if (type == "none") {
68 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone ); 69 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone );
69 else if (type == "2x") 70 } else if (type == "2x") {
70 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample2x); 71 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample2x);
71 else if (type == "4x") 72 } else if (type == "4x") {
72 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x); 73 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x);
73 else 74 } else {
74 es.throwUninformativeAndGenericDOMException(InvalidStateError); 75 es.throwDOMException(
76 InvalidStateError,
77 ExceptionMessages::failedToSet(
78 "oversample",
79 "WaveShaperNode",
80 "invalid oversample '" + type + "': must be 'none', '2x', or '4x '."));
81 }
75 } 82 }
76 83
77 String WaveShaperNode::oversample() const 84 String WaveShaperNode::oversample() const
78 { 85 {
79 switch (const_cast<WaveShaperNode*>(this)->waveShaperProcessor()->oversample ()) { 86 switch (const_cast<WaveShaperNode*>(this)->waveShaperProcessor()->oversample ()) {
80 case WaveShaperProcessor::OverSampleNone: 87 case WaveShaperProcessor::OverSampleNone:
81 return "none"; 88 return "none";
82 case WaveShaperProcessor::OverSample2x: 89 case WaveShaperProcessor::OverSample2x:
83 return "2x"; 90 return "2x";
84 case WaveShaperProcessor::OverSample4x: 91 case WaveShaperProcessor::OverSample4x:
85 return "4x"; 92 return "4x";
86 default: 93 default:
87 ASSERT_NOT_REACHED(); 94 ASSERT_NOT_REACHED();
88 return "none"; 95 return "none";
89 } 96 }
90 } 97 }
91 98
92 } // namespace WebCore 99 } // namespace WebCore
93 100
94 #endif // ENABLE(WEB_AUDIO) 101 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/OfflineAudioContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698