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

Side by Side Diff: Source/modules/webaudio/OfflineAudioContext.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/DelayNode.cpp ('k') | Source/modules/webaudio/WaveShaperNode.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) 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
(...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/OfflineAudioContext.h" 29 #include "modules/webaudio/OfflineAudioContext.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/Document.h" 33 #include "core/dom/Document.h"
33 #include "core/dom/ExceptionCode.h" 34 #include "core/dom/ExceptionCode.h"
34 #include "core/dom/ScriptExecutionContext.h" 35 #include "core/dom/ScriptExecutionContext.h"
35 36
36 namespace WebCore { 37 namespace WebCore {
37 38
38 PassRefPtr<OfflineAudioContext> OfflineAudioContext::create(ScriptExecutionConte xt* context, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionState& es) 39 PassRefPtr<OfflineAudioContext> OfflineAudioContext::create(ScriptExecutionConte xt* context, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionState& es)
39 { 40 {
40 // FIXME: add support for workers. 41 // FIXME: add support for workers.
41 if (!context || !context->isDocument()) { 42 if (!context || !context->isDocument()) {
42 es.throwUninformativeAndGenericDOMException(NotSupportedError); 43 es.throwDOMException(
44 NotSupportedError,
45 ExceptionMessages::failedToConstruct("OfflineAudioContext"));
43 return 0; 46 return 0;
44 } 47 }
45 48
46 Document* document = toDocument(context); 49 Document* document = toDocument(context);
47 50
48 if (numberOfChannels > 10 || !isSampleRateRangeGood(sampleRate)) { 51 if (numberOfChannels > 10) {
49 es.throwUninformativeAndGenericDOMException(SyntaxError); 52 es.throwDOMException(
53 SyntaxError,
54 ExceptionMessages::failedToConstruct(
55 "OfflineAudioContext",
56 "number of channels (" + String::number(numberOfChannels) + ") e xceeds maximum (10)."));
50 return 0; 57 return 0;
51 } 58 }
52 59
60 if (!isSampleRateRangeGood(sampleRate)) {
61 es.throwDOMException(
62 SyntaxError,
63 ExceptionMessages::failedToConstruct(
64 "OfflineAudioContext",
65 "sample rate (" + String::number(sampleRate) + ") must be in the range 44100-96000 Hz."));
66 return 0;
67 }
68
53 RefPtr<OfflineAudioContext> audioContext(adoptRef(new OfflineAudioContext(do cument, numberOfChannels, numberOfFrames, sampleRate))); 69 RefPtr<OfflineAudioContext> audioContext(adoptRef(new OfflineAudioContext(do cument, numberOfChannels, numberOfFrames, sampleRate)));
54 audioContext->suspendIfNeeded(); 70 audioContext->suspendIfNeeded();
55 return audioContext.release(); 71 return audioContext.release();
56 } 72 }
57 73
58 OfflineAudioContext::OfflineAudioContext(Document* document, unsigned numberOfCh annels, size_t numberOfFrames, float sampleRate) 74 OfflineAudioContext::OfflineAudioContext(Document* document, unsigned numberOfCh annels, size_t numberOfFrames, float sampleRate)
59 : AudioContext(document, numberOfChannels, numberOfFrames, sampleRate) 75 : AudioContext(document, numberOfChannels, numberOfFrames, sampleRate)
60 { 76 {
61 ScriptWrappable::init(this); 77 ScriptWrappable::init(this);
62 } 78 }
63 79
64 OfflineAudioContext::~OfflineAudioContext() 80 OfflineAudioContext::~OfflineAudioContext()
65 { 81 {
66 } 82 }
67 83
68 } // namespace WebCore 84 } // namespace WebCore
69 85
70 #endif // ENABLE(WEB_AUDIO) 86 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/DelayNode.cpp ('k') | Source/modules/webaudio/WaveShaperNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698