Index: Source/web/SpeechRecognitionClientProxy.cpp |
diff --git a/Source/web/SpeechRecognitionClientProxy.cpp b/Source/web/SpeechRecognitionClientProxy.cpp |
index 479f15d5ed6cbc5bad804618516c0547c1a9c980..51af0631d5de261b40a362813b78f373108457d7 100644 |
--- a/Source/web/SpeechRecognitionClientProxy.cpp |
+++ b/Source/web/SpeechRecognitionClientProxy.cpp |
@@ -27,12 +27,14 @@ |
#include "web/SpeechRecognitionClientProxy.h" |
#include "core/dom/ExecutionContext.h" |
+#include "modules/mediastream/MediaStreamTrack.h" |
#include "modules/speech/SpeechGrammarList.h" |
#include "modules/speech/SpeechRecognition.h" |
#include "modules/speech/SpeechRecognitionError.h" |
#include "modules/speech/SpeechRecognitionResult.h" |
#include "modules/speech/SpeechRecognitionResultList.h" |
#include "platform/weborigin/SecurityOrigin.h" |
+#include "public/platform/WebMediaStreamTrack.h" |
#include "public/web/WebSecurityOrigin.h" |
#include "public/web/WebSpeechGrammar.h" |
#include "public/web/WebSpeechRecognitionHandle.h" |
@@ -52,13 +54,16 @@ PassOwnPtr<SpeechRecognitionClientProxy> SpeechRecognitionClientProxy::create(We |
return adoptPtr(new SpeechRecognitionClientProxy(recognizer)); |
} |
-void SpeechRecognitionClientProxy::start(SpeechRecognition* recognition, const SpeechGrammarList* grammarList, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives) |
+void SpeechRecognitionClientProxy::start(SpeechRecognition* recognition, const SpeechGrammarList* grammarList, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack* audioTrack) |
{ |
WebVector<WebSpeechGrammar> webSpeechGrammars(static_cast<size_t>(grammarList->length())); |
for (unsigned long i = 0; i < grammarList->length(); ++i) |
webSpeechGrammars[i] = grammarList->item(i); |
- WebSpeechRecognitionParams params(webSpeechGrammars, lang, continuous, interimResults, maxAlternatives, WebSecurityOrigin(recognition->executionContext()->securityOrigin())); |
+ WebMediaStreamTrack track; |
+ if (audioTrack) |
+ track.assign(audioTrack->component()); |
+ WebSpeechRecognitionParams params(webSpeechGrammars, lang, continuous, interimResults, maxAlternatives, track, WebSecurityOrigin(recognition->executionContext()->securityOrigin())); |
m_recognizer->start(WebSpeechRecognitionHandle(recognition), params, this); |
} |