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

Side by Side Diff: Source/platform/speech/PlatformSpeechSynthesisUtterance.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 PlatformSpeechSynthesisUtterance_h 26 #ifndef PlatformSpeechSynthesisUtterance_h
27 #define PlatformSpeechSynthesisUtterance_h 27 #define PlatformSpeechSynthesisUtterance_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/PassRefPtr.h"
32 #include "wtf/RefCounted.h"
33 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 class PlatformSpeechSynthesisUtteranceClient { 36 class PlatformSpeechSynthesisUtteranceClient : public GarbageCollectedMixin {
38 public: 37 public:
39 // Implement methods as needed. 38 // Implement methods as needed.
40 protected: 39 protected:
41 virtual ~PlatformSpeechSynthesisUtteranceClient() { } 40 virtual ~PlatformSpeechSynthesisUtteranceClient() { }
42 }; 41 };
43 42
44 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance : public RefCounted<Platf ormSpeechSynthesisUtterance> { 43 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance FINAL : public GarbageCol lectedFinalized<PlatformSpeechSynthesisUtterance> {
45 public: 44 public:
46 static PassRefPtr<PlatformSpeechSynthesisUtterance> create(PlatformSpeechSyn thesisUtteranceClient*); 45 static PlatformSpeechSynthesisUtterance* create(PlatformSpeechSynthesisUtter anceClient*);
47 46
48 const String& text() const { return m_text; } 47 const String& text() const { return m_text; }
49 void setText(const String& text) { m_text = text; } 48 void setText(const String& text) { m_text = text; }
50 49
51 const String& lang() const { return m_lang; } 50 const String& lang() const { return m_lang; }
52 void setLang(const String& lang) { m_lang = lang; } 51 void setLang(const String& lang) { m_lang = lang; }
53 52
54 PlatformSpeechSynthesisVoice* voice() const { return m_voice.get(); } 53 PlatformSpeechSynthesisVoice* voice() const { return m_voice; }
55 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; } 54 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; }
56 55
57 // Range = [0, 1] where 1 is the default. 56 // Range = [0, 1] where 1 is the default.
58 float volume() const { return m_volume; } 57 float volume() const { return m_volume; }
59 void setVolume(float volume) { m_volume = std::max(std::min(1.0f, volume), 0 .0f); } 58 void setVolume(float volume) { m_volume = std::max(std::min(1.0f, volume), 0 .0f); }
60 59
61 // Range = [0.1, 10] where 1 is the default. 60 // Range = [0.1, 10] where 1 is the default.
62 float rate() const { return m_rate; } 61 float rate() const { return m_rate; }
63 void setRate(float rate) { m_rate = std::max(std::min(10.0f, rate), 0.1f); } 62 void setRate(float rate) { m_rate = std::max(std::min(10.0f, rate), 0.1f); }
64 63
65 // Range = [0, 2] where 1 is the default. 64 // Range = [0, 2] where 1 is the default.
66 float pitch() const { return m_pitch; } 65 float pitch() const { return m_pitch; }
67 void setPitch(float pitch) { m_pitch = std::max(std::min(2.0f, pitch), 0.0f) ; } 66 void setPitch(float pitch) { m_pitch = std::max(std::min(2.0f, pitch), 0.0f) ; }
68 67
69 double startTime() const { return m_startTime; } 68 double startTime() const { return m_startTime; }
70 void setStartTime(double startTime) { m_startTime = startTime; } 69 void setStartTime(double startTime) { m_startTime = startTime; }
71 70
72 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; } 71 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; }
73 void setClient(PlatformSpeechSynthesisUtteranceClient* client) { m_client = client; } 72
73 void trace(Visitor*);
74 74
75 private: 75 private:
76 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*); 76 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*);
77 77
78 PlatformSpeechSynthesisUtteranceClient* m_client; 78 Member<PlatformSpeechSynthesisUtteranceClient> m_client;
79 String m_text; 79 String m_text;
80 String m_lang; 80 String m_lang;
81 RefPtr<PlatformSpeechSynthesisVoice> m_voice; 81 Member<PlatformSpeechSynthesisVoice> m_voice;
82 float m_volume; 82 float m_volume;
83 float m_rate; 83 float m_rate;
84 float m_pitch; 84 float m_pitch;
85 double m_startTime; 85 double m_startTime;
86 }; 86 };
87 87
88 } // namespace WebCore 88 } // namespace WebCore
89 89
90 #endif // PlatformSpeechSynthesisUtterance_h 90 #endif // PlatformSpeechSynthesisUtterance_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698