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

Side by Side Diff: third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisVoice.h

Issue 1617383003: Move PlatformSpeechSynthesisVoice off the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix oilpan compilation Created 4 years, 11 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 PlatformSpeechSynthesisVoice_h 26 #ifndef PlatformSpeechSynthesisVoice_h
27 #define PlatformSpeechSynthesisVoice_h 27 #define PlatformSpeechSynthesisVoice_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/heap/Handle.h" 30 #include "wtf/PassRefPtr.h"
31 #include "wtf/RefCounted.h"
31 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 class PLATFORM_EXPORT PlatformSpeechSynthesisVoice final : public GarbageCollect edFinalized<PlatformSpeechSynthesisVoice> { 36 class PLATFORM_EXPORT PlatformSpeechSynthesisVoice final : public RefCounted<Pla tformSpeechSynthesisVoice> {
36 public: 37 public:
37 static PlatformSpeechSynthesisVoice* create(const String& voiceURI, const St ring& name, const String& lang, bool localService, bool isDefault); 38 static PassRefPtr<PlatformSpeechSynthesisVoice> create(const String& voiceUR I, const String& name, const String& lang, bool localService, bool isDefault);
38 static PlatformSpeechSynthesisVoice* create(); 39 static PassRefPtr<PlatformSpeechSynthesisVoice> create();
39 40
40 const String& voiceURI() const { return m_voiceURI; } 41 const String& voiceURI() const { return m_voiceURI; }
41 void setVoiceURI(const String& voiceURI) { m_voiceURI = voiceURI; } 42 void setVoiceURI(const String& voiceURI) { m_voiceURI = voiceURI; }
42 43
43 const String& name() const { return m_name; } 44 const String& name() const { return m_name; }
44 void setName(const String& name) { m_name = name; } 45 void setName(const String& name) { m_name = name; }
45 46
46 const String& lang() const { return m_lang; } 47 const String& lang() const { return m_lang; }
47 void setLang(const String& lang) { m_lang = lang; } 48 void setLang(const String& lang) { m_lang = lang; }
48 49
49 bool localService() const { return m_localService; } 50 bool localService() const { return m_localService; }
50 void setLocalService(bool localService) { m_localService = localService; } 51 void setLocalService(bool localService) { m_localService = localService; }
51 52
52 bool isDefault() const { return m_default; } 53 bool isDefault() const { return m_default; }
53 void setIsDefault(bool isDefault) { m_default = isDefault; } 54 void setIsDefault(bool isDefault) { m_default = isDefault; }
54 55
55 DEFINE_INLINE_TRACE() { }
56
57 private: 56 private:
58 PlatformSpeechSynthesisVoice(const String& voiceURI, const String& name, con st String& lang, bool localService, bool isDefault); 57 PlatformSpeechSynthesisVoice(const String& voiceURI, const String& name, con st String& lang, bool localService, bool isDefault);
59 PlatformSpeechSynthesisVoice(); 58 PlatformSpeechSynthesisVoice();
60 59
61 String m_voiceURI; 60 String m_voiceURI;
62 String m_name; 61 String m_name;
63 String m_lang; 62 String m_lang;
64 bool m_localService; 63 bool m_localService;
65 bool m_default; 64 bool m_default;
66 }; 65 };
67 66
68 } // namespace blink 67 } // namespace blink
69 68
70 #endif // PlatformSpeechSynthesisVoice_h 69 #endif // PlatformSpeechSynthesisVoice_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698