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

Side by Side Diff: Source/modules/webaudio/DefaultAudioDestinationNode.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/AudioNode.cpp ('k') | Source/modules/webaudio/DelayNode.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) 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/DefaultAudioDestinationNode.h" 29 #include "modules/webaudio/DefaultAudioDestinationNode.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 "core/platform/Logging.h" 34 #include "core/platform/Logging.h"
34 #include "wtf/MainThread.h" 35 #include "wtf/MainThread.h"
35 36
36 const unsigned EnabledInputChannels = 2; 37 const unsigned EnabledInputChannels = 2;
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
40 DefaultAudioDestinationNode::DefaultAudioDestinationNode(AudioContext* context) 41 DefaultAudioDestinationNode::DefaultAudioDestinationNode(AudioContext* context)
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 113
113 void DefaultAudioDestinationNode::setChannelCount(unsigned long channelCount, Ex ceptionState& es) 114 void DefaultAudioDestinationNode::setChannelCount(unsigned long channelCount, Ex ceptionState& es)
114 { 115 {
115 // The channelCount for the input to this node controls the actual number of channels we 116 // The channelCount for the input to this node controls the actual number of channels we
116 // send to the audio hardware. It can only be set depending on the maximum n umber of 117 // send to the audio hardware. It can only be set depending on the maximum n umber of
117 // channels supported by the hardware. 118 // channels supported by the hardware.
118 119
119 ASSERT(isMainThread()); 120 ASSERT(isMainThread());
120 121
121 if (!maxChannelCount() || channelCount > maxChannelCount()) { 122 if (!maxChannelCount() || channelCount > maxChannelCount()) {
122 es.throwUninformativeAndGenericDOMException(InvalidStateError); 123 es.throwDOMException(
124 InvalidStateError,
125 ExceptionMessages::failedToSet(
126 "channelCount",
127 "AudioDestinationNode",
128 "channel count (" + String::number(channelCount)
129 + ") must be between 1 and "
130 + String::number(maxChannelCount()) + "."));
123 return; 131 return;
124 } 132 }
125 133
126 unsigned long oldChannelCount = this->channelCount(); 134 unsigned long oldChannelCount = this->channelCount();
127 AudioNode::setChannelCount(channelCount, es); 135 AudioNode::setChannelCount(channelCount, es);
128 136
129 if (!es.hadException() && this->channelCount() != oldChannelCount && isIniti alized()) { 137 if (!es.hadException() && this->channelCount() != oldChannelCount && isIniti alized()) {
130 // Re-create destination. 138 // Re-create destination.
131 m_destination->stop(); 139 m_destination->stop();
132 createDestination(); 140 createDestination();
133 m_destination->start(); 141 m_destination->start();
134 } 142 }
135 } 143 }
136 144
137 } // namespace WebCore 145 } // namespace WebCore
138 146
139 #endif // ENABLE(WEB_AUDIO) 147 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/AudioNode.cpp ('k') | Source/modules/webaudio/DelayNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698