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

Side by Side Diff: Source/platform/speech/PlatformSpeechSynthesizer.h

Issue 339823003: Oilpan: move platform speech objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Trace SpeechRecognition's controller reference. Created 6 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) 2013 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Computer, 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. 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 APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. 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 PlatformSpeechSynthesizer_h 26 #ifndef PlatformSpeechSynthesizer_h
27 #define PlatformSpeechSynthesizer_h 27 #define PlatformSpeechSynthesizer_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/heap/Handle.h"
30 #include "platform/speech/PlatformSpeechSynthesisVoice.h" 31 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
31 #include "wtf/PassOwnPtr.h"
32 #include "wtf/Vector.h" 32 #include "wtf/Vector.h"
33 33
34 namespace blink { 34 namespace blink {
35 class WebSpeechSynthesizer; 35 class WebSpeechSynthesizer;
36 class WebSpeechSynthesizerClient; 36 class WebSpeechSynthesizerClient;
37 } 37 }
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 enum SpeechBoundary { 41 enum SpeechBoundary {
42 SpeechWordBoundary, 42 SpeechWordBoundary,
43 SpeechSentenceBoundary 43 SpeechSentenceBoundary
44 }; 44 };
45 45
46 class PlatformSpeechSynthesisUtterance; 46 class PlatformSpeechSynthesisUtterance;
47 class WebSpeechSynthesizerClientImpl;
47 48
48 class PlatformSpeechSynthesizerClient { 49 class PlatformSpeechSynthesizerClient : public GarbageCollectedMixin {
49 public: 50 public:
50 virtual void didStartSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) = 0; 51 virtual void didStartSpeaking(PlatformSpeechSynthesisUtterance*) = 0;
51 virtual void didFinishSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) = 0; 52 virtual void didFinishSpeaking(PlatformSpeechSynthesisUtterance*) = 0;
52 virtual void didPauseSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) = 0; 53 virtual void didPauseSpeaking(PlatformSpeechSynthesisUtterance*) = 0;
53 virtual void didResumeSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) = 0; 54 virtual void didResumeSpeaking(PlatformSpeechSynthesisUtterance*) = 0;
54 virtual void speakingErrorOccurred(PassRefPtr<PlatformSpeechSynthesisUtteran ce>) = 0; 55 virtual void speakingErrorOccurred(PlatformSpeechSynthesisUtterance*) = 0;
55 virtual void boundaryEventOccurred(PassRefPtr<PlatformSpeechSynthesisUtteran ce>, SpeechBoundary, unsigned charIndex) = 0; 56 virtual void boundaryEventOccurred(PlatformSpeechSynthesisUtterance*, Speech Boundary, unsigned charIndex) = 0;
56 virtual void voicesDidChange() = 0; 57 virtual void voicesDidChange() = 0;
58
59 virtual void trace(Visitor*) { }
57 protected: 60 protected:
58 virtual ~PlatformSpeechSynthesizerClient() { } 61 virtual ~PlatformSpeechSynthesizerClient() { }
59 }; 62 };
60 63
61 class PLATFORM_EXPORT PlatformSpeechSynthesizer { 64 class PLATFORM_EXPORT PlatformSpeechSynthesizer : public GarbageCollectedFinaliz ed<PlatformSpeechSynthesizer> {
62 WTF_MAKE_NONCOPYABLE(PlatformSpeechSynthesizer); 65 WTF_MAKE_NONCOPYABLE(PlatformSpeechSynthesizer);
63 public: 66 public:
64 static PassOwnPtr<PlatformSpeechSynthesizer> create(PlatformSpeechSynthesize rClient*); 67 static PlatformSpeechSynthesizer* create(PlatformSpeechSynthesizerClient*);
65 68
66 virtual ~PlatformSpeechSynthesizer(); 69 virtual ~PlatformSpeechSynthesizer();
67 70
68 const Vector<RefPtr<PlatformSpeechSynthesisVoice> >& voiceList() const { ret urn m_voiceList; } 71 const HeapVector<Member<PlatformSpeechSynthesisVoice> >& voiceList() const { return m_voiceList; }
69 virtual void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>); 72 virtual void speak(PlatformSpeechSynthesisUtterance*);
70 virtual void pause(); 73 virtual void pause();
71 virtual void resume(); 74 virtual void resume();
72 virtual void cancel(); 75 virtual void cancel();
73 76
74 PlatformSpeechSynthesizerClient* client() const { return m_speechSynthesizer Client; } 77 PlatformSpeechSynthesizerClient* client() const { return m_speechSynthesizer Client; }
75 78
76 void setVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice> >&); 79 void setVoiceList(HeapVector<Member<PlatformSpeechSynthesisVoice> >&);
80
81 virtual void trace(Visitor*);
77 82
78 protected: 83 protected:
84 explicit PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient*);
85
79 virtual void initializeVoiceList(); 86 virtual void initializeVoiceList();
80 explicit PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient*); 87
81 Vector<RefPtr<PlatformSpeechSynthesisVoice> > m_voiceList; 88 HeapVector<Member<PlatformSpeechSynthesisVoice> > m_voiceList;
82 89
83 private: 90 private:
84 PlatformSpeechSynthesizerClient* m_speechSynthesizerClient; 91 Member<PlatformSpeechSynthesizerClient> m_speechSynthesizerClient;
85 92
86 OwnPtr<blink::WebSpeechSynthesizer> m_webSpeechSynthesizer; 93 OwnPtr<blink::WebSpeechSynthesizer> m_webSpeechSynthesizer;
87 OwnPtr<blink::WebSpeechSynthesizerClient> m_webSpeechSynthesizerClient; 94 Member<WebCore::WebSpeechSynthesizerClientImpl> m_webSpeechSynthesizerClient ;
88 }; 95 };
89 96
90 } // namespace WebCore 97 } // namespace WebCore
91 98
92 #endif // PlatformSpeechSynthesizer_h 99 #endif // PlatformSpeechSynthesizer_h
OLDNEW
« no previous file with comments | « Source/platform/speech/PlatformSpeechSynthesisVoice.cpp ('k') | Source/platform/speech/PlatformSpeechSynthesizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698