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

Side by Side Diff: third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisUtterance.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
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance final : public GarbageCol lectedFinalized<PlatformSpeechSynthesisUtterance> { 44 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance final : public GarbageCol lectedFinalized<PlatformSpeechSynthesisUtterance> {
45 public: 45 public:
46 static PlatformSpeechSynthesisUtterance* create(PlatformSpeechSynthesisUtter anceClient*); 46 static PlatformSpeechSynthesisUtterance* create(PlatformSpeechSynthesisUtter anceClient*);
47 47
48 const String& text() const { return m_text; } 48 const String& text() const { return m_text; }
49 void setText(const String& text) { m_text = text; } 49 void setText(const String& text) { m_text = text; }
50 50
51 const String& lang() const { return m_lang; } 51 const String& lang() const { return m_lang; }
52 void setLang(const String& lang) { m_lang = lang; } 52 void setLang(const String& lang) { m_lang = lang; }
53 53
54 PlatformSpeechSynthesisVoice* voice() const { return m_voice; } 54 PlatformSpeechSynthesisVoice* voice() const { return m_voice.get(); }
55 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; } 55 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; }
56 56
57 // Range = [0, 1] where 1 is the default. 57 // Range = [0, 1] where 1 is the default.
58 float volume() const { return m_volume; } 58 float volume() const { return m_volume; }
59 void setVolume(float volume) { m_volume = clampTo(volume, 0.0f, 1.0f); } 59 void setVolume(float volume) { m_volume = clampTo(volume, 0.0f, 1.0f); }
60 60
61 // Range = [0.1, 10] where 1 is the default. 61 // Range = [0.1, 10] where 1 is the default.
62 float rate() const { return m_rate; } 62 float rate() const { return m_rate; }
63 void setRate(float rate) { m_rate = clampTo(rate, 0.1f, 10.0f); } 63 void setRate(float rate) { m_rate = clampTo(rate, 0.1f, 10.0f); }
64 64
65 // Range = [0, 2] where 1 is the default. 65 // Range = [0, 2] where 1 is the default.
66 float pitch() const { return m_pitch; } 66 float pitch() const { return m_pitch; }
67 void setPitch(float pitch) { m_pitch = clampTo(pitch, 0.0f, 2.0f); } 67 void setPitch(float pitch) { m_pitch = clampTo(pitch, 0.0f, 2.0f); }
68 68
69 double startTime() const { return m_startTime; } 69 double startTime() const { return m_startTime; }
70 void setStartTime(double startTime) { m_startTime = startTime; } 70 void setStartTime(double startTime) { m_startTime = startTime; }
71 71
72 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; } 72 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; }
73 73
74 DECLARE_TRACE(); 74 DECLARE_TRACE();
75 75
76 private: 76 private:
77 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*); 77 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*);
78 78
79 Member<PlatformSpeechSynthesisUtteranceClient> m_client; 79 Member<PlatformSpeechSynthesisUtteranceClient> m_client;
80 String m_text; 80 String m_text;
81 String m_lang; 81 String m_lang;
82 Member<PlatformSpeechSynthesisVoice> m_voice; 82 RefPtr<PlatformSpeechSynthesisVoice> m_voice;
83 float m_volume; 83 float m_volume;
84 float m_rate; 84 float m_rate;
85 float m_pitch; 85 float m_pitch;
86 double m_startTime; 86 double m_startTime;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // PlatformSpeechSynthesisUtterance_h 91 #endif // PlatformSpeechSynthesisUtterance_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698