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

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

Issue 24877002: Add more informative messages for DOM exceptions. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 14 matching lines...) Expand all
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 30
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "modules/webaudio/AudioBuffer.h" 33 #include "modules/webaudio/AudioBuffer.h"
34 34
35 #include "bindings/v8/ExceptionMessages.h"
35 #include "bindings/v8/ExceptionState.h" 36 #include "bindings/v8/ExceptionState.h"
36 #include "core/dom/ExceptionCode.h" 37 #include "core/dom/ExceptionCode.h"
37 #include "core/platform/audio/AudioBus.h" 38 #include "core/platform/audio/AudioBus.h"
38 #include "core/platform/audio/AudioFileReader.h" 39 #include "core/platform/audio/AudioFileReader.h"
39 #include "modules/webaudio/AudioContext.h" 40 #include "modules/webaudio/AudioContext.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate) 44 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate)
44 { 45 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 91 }
91 92
92 void AudioBuffer::releaseMemory() 93 void AudioBuffer::releaseMemory()
93 { 94 {
94 m_channels.clear(); 95 m_channels.clear();
95 } 96 }
96 97
97 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionState& es) 98 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionState& es)
98 { 99 {
99 if (channelIndex >= m_channels.size()) { 100 if (channelIndex >= m_channels.size()) {
100 es.throwUninformativeAndGenericDOMException(SyntaxError); 101 es.throwDOMException(
102 SyntaxError,
103 ExceptionMessages::failedToGet(
104 "getChannelData",
Mike West 2013/09/27 06:44:39 If this is called as `ab.getChannelData()`, then I
105 "AudioBuffer",
106 "invalid channel index."));
Mike West 2013/09/27 06:44:39 How about "The provided index (" + String::number(
101 return 0; 107 return 0;
102 } 108 }
103 109
104 Float32Array* channelData = m_channels[channelIndex].get(); 110 Float32Array* channelData = m_channels[channelIndex].get();
105 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length()); 111 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length());
106 } 112 }
107 113
108 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex) 114 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex)
109 { 115 {
110 if (channelIndex >= m_channels.size()) 116 if (channelIndex >= m_channels.size())
111 return 0; 117 return 0;
112 118
113 return m_channels[channelIndex].get(); 119 return m_channels[channelIndex].get();
114 } 120 }
115 121
116 void AudioBuffer::zero() 122 void AudioBuffer::zero()
117 { 123 {
118 for (unsigned i = 0; i < m_channels.size(); ++i) { 124 for (unsigned i = 0; i < m_channels.size(); ++i) {
119 if (getChannelData(i)) 125 if (getChannelData(i))
120 getChannelData(i)->zeroRange(0, length()); 126 getChannelData(i)->zeroRange(0, length());
121 } 127 }
122 } 128 }
123 129
124 } // namespace WebCore 130 } // namespace WebCore
125 131
126 #endif // ENABLE(WEB_AUDIO) 132 #endif // ENABLE(WEB_AUDIO)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698