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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 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 SpeechRecognitionClientProxy_h | 26 #ifndef SpeechRecognitionClientProxy_h |
| 27 #define SpeechRecognitionClientProxy_h | 27 #define SpeechRecognitionClientProxy_h |
| 28 | 28 |
| 29 #include "modules/speech/SpeechRecognitionClient.h" | 29 #include "modules/speech/SpeechRecognitionClient.h" |
| 30 #include "platform/weborigin/KURL.h" | |
|
jochen (gone - plz use gerrit)
2015/05/05 13:57:53
same here
kirtia
2015/05/05 23:12:29
Done.
| |
| 30 #include "public/web/WebSpeechRecognizerClient.h" | 31 #include "public/web/WebSpeechRecognizerClient.h" |
| 31 #include "wtf/Compiler.h" | 32 #include "wtf/Compiler.h" |
| 32 #include "wtf/PassOwnPtr.h" | 33 #include "wtf/PassOwnPtr.h" |
| 33 #include "wtf/text/WTFString.h" | 34 #include "wtf/text/WTFString.h" |
| 34 | 35 |
| 35 namespace blink { | 36 namespace blink { |
| 36 | 37 |
| 37 class MediaStreamTrack; | 38 class MediaStreamTrack; |
| 38 class WebSpeechRecognizer; | 39 class WebSpeechRecognizer; |
| 39 class WebString; | 40 class WebString; |
| 40 | 41 |
| 41 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { | 42 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { |
| 42 public: | 43 public: |
| 43 virtual ~SpeechRecognitionClientProxy(); | 44 virtual ~SpeechRecognitionClientProxy(); |
| 44 | 45 |
| 45 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in | 46 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in |
| 46 // 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. |
| 47 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; | 48 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; |
| 48 | 49 |
| 49 // SpeechRecognitionClient: | 50 // SpeechRecognitionClient: |
| 50 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, const String& serviceURI, bool continuous, bool interimResults, unsigne d long maxAlternatives, MediaStreamTrack*) override; | 51 virtual void start(SpeechRecognition*, const SpeechGrammarList*, const Strin g& lang, const KURL& serviceURI, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack*) override; |
| 51 virtual void stop(SpeechRecognition*) override; | 52 virtual void stop(SpeechRecognition*) override; |
| 52 virtual void abort(SpeechRecognition*) override; | 53 virtual void abort(SpeechRecognition*) override; |
| 53 | 54 |
| 54 // WebSpeechRecognizerClient: | 55 // WebSpeechRecognizerClient: |
| 55 virtual void didStartAudio(const WebSpeechRecognitionHandle&) override; | 56 virtual void didStartAudio(const WebSpeechRecognitionHandle&) override; |
| 56 virtual void didStartSound(const WebSpeechRecognitionHandle&) override; | 57 virtual void didStartSound(const WebSpeechRecognitionHandle&) override; |
| 57 virtual void didEndSound(const WebSpeechRecognitionHandle&) override; | 58 virtual void didEndSound(const WebSpeechRecognitionHandle&) override; |
| 58 virtual void didEndAudio(const WebSpeechRecognitionHandle&) override; | 59 virtual void didEndAudio(const WebSpeechRecognitionHandle&) override; |
| 59 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; |
| 60 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) override; | 61 virtual void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebS peechRecognitionResult&) override; |
| 61 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; |
| 62 virtual void didStart(const WebSpeechRecognitionHandle&) override; | 63 virtual void didStart(const WebSpeechRecognitionHandle&) override; |
| 63 virtual void didEnd(const WebSpeechRecognitionHandle&) override; | 64 virtual void didEnd(const WebSpeechRecognitionHandle&) override; |
| 64 | 65 |
| 65 private: | 66 private: |
| 66 SpeechRecognitionClientProxy(WebSpeechRecognizer*); | 67 SpeechRecognitionClientProxy(WebSpeechRecognizer*); |
| 67 | 68 |
| 68 WebSpeechRecognizer* m_recognizer; | 69 WebSpeechRecognizer* m_recognizer; |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 }; // namespace blink | 72 }; // namespace blink |
| 72 | 73 |
| 73 #endif // SpeechRecognitionClientProxy_h | 74 #endif // SpeechRecognitionClientProxy_h |
| OLD | NEW |