Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 11 matching lines...) Expand all
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 "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"
33 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
33 #include <memory>
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class MediaStreamTrack; 37 class MediaStreamTrack;
38 class WebSpeechRecognizer; 38 class WebSpeechRecognizer;
39 class WebString; 39 class WebString;
40 40
41 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient { 41 class SpeechRecognitionClientProxy final : public SpeechRecognitionClient, publi c WebSpeechRecognizerClient {
42 public: 42 public:
43 ~SpeechRecognitionClientProxy() override; 43 ~SpeechRecognitionClientProxy() override;
44 44
45 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in 45 // Constructing a proxy object with a 0 WebSpeechRecognizer is safe in
46 // itself, but attempting to call start/stop/abort on it will crash. 46 // itself, but attempting to call start/stop/abort on it will crash.
47 static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*) ; 47 static std::unique_ptr<SpeechRecognitionClientProxy> create(WebSpeechRecogni zer*);
48 48
49 // SpeechRecognitionClient: 49 // SpeechRecognitionClient:
50 void start(SpeechRecognition*, const SpeechGrammarList*, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStrea mTrack*) override; 50 void start(SpeechRecognition*, const SpeechGrammarList*, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStrea mTrack*) override;
51 void stop(SpeechRecognition*) override; 51 void stop(SpeechRecognition*) override;
52 void abort(SpeechRecognition*) override; 52 void abort(SpeechRecognition*) override;
53 53
54 // WebSpeechRecognizerClient: 54 // WebSpeechRecognizerClient:
55 void didStartAudio(const WebSpeechRecognitionHandle&) override; 55 void didStartAudio(const WebSpeechRecognitionHandle&) override;
56 void didStartSound(const WebSpeechRecognitionHandle&) override; 56 void didStartSound(const WebSpeechRecognitionHandle&) override;
57 void didEndSound(const WebSpeechRecognitionHandle&) override; 57 void didEndSound(const WebSpeechRecognitionHandle&) override;
58 void didEndAudio(const WebSpeechRecognitionHandle&) override; 58 void didEndAudio(const WebSpeechRecognitionHandle&) override;
59 void didReceiveResults(const WebSpeechRecognitionHandle&, const WebVector<We bSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRecognition Result>& currentInterimResults) override; 59 void didReceiveResults(const WebSpeechRecognitionHandle&, const WebVector<We bSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRecognition Result>& currentInterimResults) override;
60 void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebSpeechRec ognitionResult&) override; 60 void didReceiveNoMatch(const WebSpeechRecognitionHandle&, const WebSpeechRec ognitionResult&) override;
61 void didReceiveError(const WebSpeechRecognitionHandle&, const WebString& mes sage, WebSpeechRecognizerClient::ErrorCode) override; 61 void didReceiveError(const WebSpeechRecognitionHandle&, const WebString& mes sage, WebSpeechRecognizerClient::ErrorCode) override;
62 void didStart(const WebSpeechRecognitionHandle&) override; 62 void didStart(const WebSpeechRecognitionHandle&) override;
63 void didEnd(const WebSpeechRecognitionHandle&) override; 63 void didEnd(const WebSpeechRecognitionHandle&) override;
64 64
65 private: 65 private:
66 SpeechRecognitionClientProxy(WebSpeechRecognizer*); 66 SpeechRecognitionClientProxy(WebSpeechRecognizer*);
67 67
68 WebSpeechRecognizer* m_recognizer; 68 WebSpeechRecognizer* m_recognizer;
69 }; 69 };
70 70
71 } // namespace blink 71 } // namespace blink
72 72
73 #endif // SpeechRecognitionClientProxy_h 73 #endif // SpeechRecognitionClientProxy_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698