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 #define SpeechRecognitionClientProxy_h | 27 #define SpeechRecognitionClientProxy_h |
28 | 28 |
29 #include "modules/speech/SpeechRecognitionClient.h" | 29 #include "modules/speech/SpeechRecognitionClient.h" |
30 #include "public/web/WebSpeechRecognizerClient.h" | 30 #include "public/web/WebSpeechRecognizerClient.h" |
31 #include "wtf/Compiler.h" | 31 #include "wtf/Compiler.h" |
32 #include "wtf/PassOwnPtr.h" | 32 #include "wtf/PassOwnPtr.h" |
33 #include "wtf/text/WTFString.h" | 33 #include "wtf/text/WTFString.h" |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 class MediaStreamTrack; | |
38 class WebMediaStreamTrack; | |
burnik
2014/09/17 13:47:53
This is removed for the next round.
| |
37 class WebSpeechRecognizer; | 39 class WebSpeechRecognizer; |
38 class WebString; | 40 class WebString; |
39 | 41 |
40 class SpeechRecognitionClientProxy FINAL : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { | 42 class SpeechRecognitionClientProxy FINAL : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { |
41 public: | 43 public: |
42 virtual ~SpeechRecognitionClientProxy(); | 44 virtual ~SpeechRecognitionClientProxy(); |
43 | 45 |
44 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in | 46 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in |
45 // itself, but attempting to call start/stop/abort on it will crash. | 47 // itself, but attempting to call start/stop/abort on it will crash. |
46 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; | 48 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; |
47 | 49 |
48 // SpeechRecognitionClient: | 50 // SpeechRecognitionClient: |
49 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, bool continuous, bool interimResults, unsigned long maxAlternatives) OV ERRIDE; | 51 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, Me diaStreamTrack*) OVERRIDE; |
50 virtual void stop(SpeechRecognition*) OVERRIDE; | 52 virtual void stop(SpeechRecognition*) OVERRIDE; |
51 virtual void abort(SpeechRecognition*) OVERRIDE; | 53 virtual void abort(SpeechRecognition*) OVERRIDE; |
52 | 54 |
53 // WebSpeechRecognizerClient: | 55 // WebSpeechRecognizerClient: |
54 virtual void didStartAudio(const WebSpeechRecognitionHandle&) OVERRIDE; | 56 virtual void didStartAudio(const WebSpeechRecognitionHandle&) OVERRIDE; |
55 virtual void didStartSound(const WebSpeechRecognitionHandle&) OVERRIDE; | 57 virtual void didStartSound(const WebSpeechRecognitionHandle&) OVERRIDE; |
56 virtual void didEndSound(const WebSpeechRecognitionHandle&) OVERRIDE; | 58 virtual void didEndSound(const WebSpeechRecognitionHandle&) OVERRIDE; |
57 virtual void didEndAudio(const WebSpeechRecognitionHandle&) OVERRIDE; | 59 virtual void didEndAudio(const WebSpeechRecognitionHandle&) OVERRIDE; |
58 virtual void didReceiveResults(const WebSpeechRecognitionHandle&, const WebV ector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRec ognitionResult>& currentInterimResults) OVERRIDE; | 60 virtual void didReceiveResults(const WebSpeechRecognitionHandle&, const WebV ector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRec ognitionResult>& currentInterimResults) OVERRIDE; |
59 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) OVERRIDE; | 61 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) OVERRIDE; |
60 virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebStr ing& message, WebSpeechRecognizerClient::ErrorCode) OVERRIDE; | 62 virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebStr ing& message, WebSpeechRecognizerClient::ErrorCode) OVERRIDE; |
61 virtual void didStart(const WebSpeechRecognitionHandle&) OVERRIDE; | 63 virtual void didStart(const WebSpeechRecognitionHandle&) OVERRIDE; |
62 virtual void didEnd(const WebSpeechRecognitionHandle&) OVERRIDE; | 64 virtual void didEnd(const WebSpeechRecognitionHandle&) OVERRIDE; |
63 | 65 |
64 private: | 66 private: |
65 SpeechRecognitionClientProxy(WebSpeechRecognizer*); | 67 SpeechRecognitionClientProxy(WebSpeechRecognizer*); |
66 | 68 |
67 WebSpeechRecognizer* m_recognizer; | 69 WebSpeechRecognizer* m_recognizer; |
68 }; | 70 }; |
69 | 71 |
70 }; // namespace blink | 72 }; // namespace blink |
71 | 73 |
72 #endif // SpeechRecognitionClientProxy_h | 74 #endif // SpeechRecognitionClientProxy_h |
OLD | NEW |