| 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 10 matching lines...) Expand all Loading... |
| 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 #ifndef SpeechRecognitionController_h | 26 #ifndef SpeechRecognitionController_h |
| 27 #define SpeechRecognitionController_h | 27 #define SpeechRecognitionController_h |
| 28 | 28 |
| 29 #include "core/page/Page.h" | 29 #include "core/page/Page.h" |
| 30 #include "modules/speech/SpeechRecognitionClient.h" | 30 #include "modules/speech/SpeechRecognitionClient.h" |
| 31 #include "platform/weborigin/KURL.h" |
| 31 #include "wtf/PassOwnPtr.h" | 32 #include "wtf/PassOwnPtr.h" |
| 32 | 33 |
| 33 namespace blink { | 34 namespace blink { |
| 34 | 35 |
| 35 class MediaStreamTrack; | 36 class MediaStreamTrack; |
| 36 | 37 |
| 37 class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFin
alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { | 38 class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFin
alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { |
| 38 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); | 39 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); |
| 39 public: | 40 public: |
| 40 virtual ~SpeechRecognitionController(); | 41 virtual ~SpeechRecognitionController(); |
| 41 | 42 |
| 42 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars
, const String& lang, bool continuous, bool interimResults, unsigned long maxAlt
ernatives, MediaStreamTrack* audioTrack) | 43 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars
, const String& lang, const KURL& serviceURI, bool continuous, bool interimResul
ts, unsigned long maxAlternatives, MediaStreamTrack* audioTrack) |
| 43 { | 44 { |
| 44 m_client->start(recognition, grammars, lang, continuous, interimResults,
maxAlternatives, audioTrack); | 45 m_client->start(recognition, grammars, lang, serviceURI, continuous, int
erimResults, maxAlternatives, audioTrack); |
| 45 } | 46 } |
| 46 | 47 |
| 47 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); } | 48 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); } |
| 48 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); } | 49 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); } |
| 49 | 50 |
| 50 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr
<SpeechRecognitionClient>); | 51 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr
<SpeechRecognitionClient>); |
| 51 static const char* supplementName(); | 52 static const char* supplementName(); |
| 52 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp
eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam
e())); } | 53 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp
eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam
e())); } |
| 53 | 54 |
| 54 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor);
} | 55 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor);
} |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>); | 58 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>); |
| 58 | 59 |
| 59 OwnPtr<SpeechRecognitionClient> m_client; | 60 OwnPtr<SpeechRecognitionClient> m_client; |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace blink | 63 } // namespace blink |
| 63 | 64 |
| 64 #endif // SpeechRecognitionController_h | 65 #endif // SpeechRecognitionController_h |
| OLD | NEW |