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

Side by Side Diff: Source/modules/speech/SpeechRecognition.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
« no previous file with comments | « Source/modules/speech/SpeechRecognition.h ('k') | Source/modules/webaudio/AnalyserNode.h » ('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 * * Redistributions of source code must retain the above copyright 7 * * 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 * * Redistributions in binary form must reproduce the above copyright 9 * * 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "modules/speech/SpeechRecognition.h" 28 #include "modules/speech/SpeechRecognition.h"
29 29
30 #include "bindings/v8/ExceptionState.h"
31 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
32 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
33 #include "core/page/Page.h" 32 #include "core/page/Page.h"
34 #include "modules/speech/SpeechRecognitionController.h" 33 #include "modules/speech/SpeechRecognitionController.h"
35 #include "modules/speech/SpeechRecognitionError.h" 34 #include "modules/speech/SpeechRecognitionError.h"
36 #include "modules/speech/SpeechRecognitionEvent.h" 35 #include "modules/speech/SpeechRecognitionEvent.h"
37 36
38 namespace WebCore { 37 namespace WebCore {
39 38
40 PassRefPtr<SpeechRecognition> SpeechRecognition::create(ScriptExecutionContext* context) 39 PassRefPtr<SpeechRecognition> SpeechRecognition::create(ScriptExecutionContext* context)
41 { 40 {
42 RefPtr<SpeechRecognition> speechRecognition(adoptRef(new SpeechRecognition(c ontext))); 41 RefPtr<SpeechRecognition> speechRecognition(adoptRef(new SpeechRecognition(c ontext)));
43 speechRecognition->suspendIfNeeded(); 42 speechRecognition->suspendIfNeeded();
44 return speechRecognition.release(); 43 return speechRecognition.release();
45 } 44 }
46 45
47 void SpeechRecognition::start(ExceptionState& es) 46 void SpeechRecognition::start(ExceptionCode& ec)
48 { 47 {
49 ASSERT(m_controller); 48 ASSERT(m_controller);
50 if (m_started) { 49 if (m_started) {
51 es.throwDOMException(InvalidStateError); 50 ec = InvalidStateError;
52 return; 51 return;
53 } 52 }
54 53
55 setPendingActivity(this); 54 setPendingActivity(this);
56 m_finalResults.clear(); 55 m_finalResults.clear();
57 m_controller->start(this, m_grammars.get(), m_lang, m_continuous, m_interimR esults, m_maxAlternatives); 56 m_controller->start(this, m_grammars.get(), m_lang, m_continuous, m_interimR esults, m_maxAlternatives);
58 m_started = true; 57 m_started = true;
59 } 58 }
60 59
61 void SpeechRecognition::stopFunction() 60 void SpeechRecognition::stopFunction()
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ASSERT(m_controller); 182 ASSERT(m_controller);
184 183
185 // FIXME: Need to hook up with Page to get notified when the visibility chan ges. 184 // FIXME: Need to hook up with Page to get notified when the visibility chan ges.
186 } 185 }
187 186
188 SpeechRecognition::~SpeechRecognition() 187 SpeechRecognition::~SpeechRecognition()
189 { 188 {
190 } 189 }
191 190
192 } // namespace WebCore 191 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechRecognition.h ('k') | Source/modules/webaudio/AnalyserNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698