Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 16 matching lines...) Expand all Loading... | |
| 27 #include "web/SpeechRecognitionClientProxy.h" | 27 #include "web/SpeechRecognitionClientProxy.h" |
| 28 | 28 |
| 29 #include "core/dom/ExecutionContext.h" | 29 #include "core/dom/ExecutionContext.h" |
| 30 #include "modules/mediastream/MediaStreamTrack.h" | 30 #include "modules/mediastream/MediaStreamTrack.h" |
| 31 #include "modules/speech/SpeechGrammarList.h" | 31 #include "modules/speech/SpeechGrammarList.h" |
| 32 #include "modules/speech/SpeechRecognition.h" | 32 #include "modules/speech/SpeechRecognition.h" |
| 33 #include "modules/speech/SpeechRecognitionError.h" | 33 #include "modules/speech/SpeechRecognitionError.h" |
| 34 #include "modules/speech/SpeechRecognitionResult.h" | 34 #include "modules/speech/SpeechRecognitionResult.h" |
| 35 #include "modules/speech/SpeechRecognitionResultList.h" | 35 #include "modules/speech/SpeechRecognitionResultList.h" |
| 36 #include "platform/RuntimeEnabledFeatures.h" | 36 #include "platform/RuntimeEnabledFeatures.h" |
| 37 #include "platform/weborigin/KURL.h" | |
|
jochen (gone - plz use gerrit)
2015/05/05 13:57:53
probably not needed?
kirtia
2015/05/05 23:12:29
Done. Yeah! Sorry about that :-)
| |
| 37 #include "platform/weborigin/SecurityOrigin.h" | 38 #include "platform/weborigin/SecurityOrigin.h" |
| 38 #include "public/platform/WebMediaStreamTrack.h" | 39 #include "public/platform/WebMediaStreamTrack.h" |
| 39 #include "public/platform/WebSecurityOrigin.h" | 40 #include "public/platform/WebSecurityOrigin.h" |
| 40 #include "public/web/WebSpeechGrammar.h" | 41 #include "public/web/WebSpeechGrammar.h" |
| 41 #include "public/web/WebSpeechRecognitionHandle.h" | 42 #include "public/web/WebSpeechRecognitionHandle.h" |
| 42 #include "public/web/WebSpeechRecognitionParams.h" | 43 #include "public/web/WebSpeechRecognitionParams.h" |
| 43 #include "public/web/WebSpeechRecognitionResult.h" | 44 #include "public/web/WebSpeechRecognitionResult.h" |
| 44 #include "public/web/WebSpeechRecognizer.h" | 45 #include "public/web/WebSpeechRecognizer.h" |
| 45 #include "wtf/PassRefPtr.h" | 46 #include "wtf/PassRefPtr.h" |
| 46 | 47 |
| 47 namespace blink { | 48 namespace blink { |
| 48 | 49 |
| 49 SpeechRecognitionClientProxy::~SpeechRecognitionClientProxy() | 50 SpeechRecognitionClientProxy::~SpeechRecognitionClientProxy() |
| 50 { | 51 { |
| 51 } | 52 } |
| 52 | 53 |
| 53 PassOwnPtr<SpeechRecognitionClientProxy> SpeechRecognitionClientProxy::create(We bSpeechRecognizer* recognizer) | 54 PassOwnPtr<SpeechRecognitionClientProxy> SpeechRecognitionClientProxy::create(We bSpeechRecognizer* recognizer) |
| 54 { | 55 { |
| 55 return adoptPtr(new SpeechRecognitionClientProxy(recognizer)); | 56 return adoptPtr(new SpeechRecognitionClientProxy(recognizer)); |
| 56 } | 57 } |
| 57 | 58 |
| 58 void SpeechRecognitionClientProxy::start(SpeechRecognition* recognition, const S peechGrammarList* grammarList, const String& lang, const String& serviceURI, boo l continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTra ck* audioTrack) | 59 void SpeechRecognitionClientProxy::start(SpeechRecognition* recognition, const S peechGrammarList* grammarList, const String& lang, const KURL& serviceURI, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack * audioTrack) |
| 59 { | 60 { |
| 60 WebVector<WebSpeechGrammar> webSpeechGrammars(static_cast<size_t>(grammarLis t->length())); | 61 WebVector<WebSpeechGrammar> webSpeechGrammars(static_cast<size_t>(grammarLis t->length())); |
| 61 for (unsigned long i = 0; i < grammarList->length(); ++i) | 62 for (unsigned long i = 0; i < grammarList->length(); ++i) |
| 62 webSpeechGrammars[i] = grammarList->item(i); | 63 webSpeechGrammars[i] = grammarList->item(i); |
| 63 | 64 |
| 64 WebMediaStreamTrack track; | 65 WebMediaStreamTrack track; |
| 65 if (RuntimeEnabledFeatures::mediaStreamSpeechEnabled() && audioTrack) | 66 if (RuntimeEnabledFeatures::mediaStreamSpeechEnabled() && audioTrack) |
| 66 track.assign(audioTrack->component()); | 67 track.assign(audioTrack->component()); |
| 67 WebSpeechRecognitionParams params(webSpeechGrammars, lang, serviceURI, conti nuous, interimResults, maxAlternatives, track, WebSecurityOrigin(recognition->ex ecutionContext()->securityOrigin())); | 68 WebSpeechRecognitionParams params(webSpeechGrammars, lang, serviceURI, conti nuous, interimResults, maxAlternatives, track, WebSecurityOrigin(recognition->ex ecutionContext()->securityOrigin())); |
| 68 m_recognizer->start(recognition, params, this); | 69 m_recognizer->start(recognition, params, this); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 SpeechRecognition* recognition(handle); | 144 SpeechRecognition* recognition(handle); |
| 144 recognition->didEnd(); | 145 recognition->didEnd(); |
| 145 } | 146 } |
| 146 | 147 |
| 147 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* recognizer) | 148 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* recognizer) |
| 148 : m_recognizer(recognizer) | 149 : m_recognizer(recognizer) |
| 149 { | 150 { |
| 150 } | 151 } |
| 151 | 152 |
| 152 } // namespace blink | 153 } // namespace blink |
| OLD | NEW |