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

Side by Side Diff: Source/modules/speech/SpeechRecognition.cpp

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 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
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
(...skipping 12 matching lines...) Expand all
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/core/v8/ExceptionState.h" 30 #include "bindings/core/v8/ExceptionState.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/dom/ExceptionCode.h" 32 #include "core/dom/ExceptionCode.h"
33 #include "core/mediastream/MediaStreamTrack.h"
33 #include "core/page/Page.h" 34 #include "core/page/Page.h"
34 #include "modules/mediastream/MediaStreamTrack.h"
35 #include "modules/speech/SpeechRecognitionController.h" 35 #include "modules/speech/SpeechRecognitionController.h"
36 #include "modules/speech/SpeechRecognitionError.h" 36 #include "modules/speech/SpeechRecognitionError.h"
37 #include "modules/speech/SpeechRecognitionEvent.h" 37 #include "modules/speech/SpeechRecognitionEvent.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 SpeechRecognition* SpeechRecognition::create(ExecutionContext* context) 41 SpeechRecognition* SpeechRecognition::create(ExecutionContext* context)
42 { 42 {
43 SpeechRecognition* speechRecognition = new SpeechRecognition(context); 43 SpeechRecognition* speechRecognition = new SpeechRecognition(context);
44 speechRecognition->suspendIfNeeded(); 44 speechRecognition->suspendIfNeeded();
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 visitor->trace(m_grammars); 198 visitor->trace(m_grammars);
199 visitor->trace(m_audioTrack); 199 visitor->trace(m_audioTrack);
200 #if ENABLE(OILPAN) 200 #if ENABLE(OILPAN)
201 visitor->trace(m_controller); 201 visitor->trace(m_controller);
202 #endif 202 #endif
203 visitor->trace(m_finalResults); 203 visitor->trace(m_finalResults);
204 EventTargetWithInlineData::trace(visitor); 204 EventTargetWithInlineData::trace(visitor);
205 } 205 }
206 206
207 } // namespace blink 207 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/rtcpeerconnection/RTCVoidRequestImpl.cpp ('k') | Source/modules/webaudio/AudioContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698