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

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

Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...)) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More rebase Created 4 years, 12 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 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 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/heap/Handle.h"
31 #include "platform/speech/PlatformSpeechSynthesisVoice.h" 31 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
32 #include "wtf/MathExtras.h"
32 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 class PlatformSpeechSynthesisUtteranceClient : public GarbageCollectedMixin { 37 class PlatformSpeechSynthesisUtteranceClient : public GarbageCollectedMixin {
37 public: 38 public:
38 // Implement methods as needed. 39 // Implement methods as needed.
39 protected: 40 protected:
40 virtual ~PlatformSpeechSynthesisUtteranceClient() { } 41 virtual ~PlatformSpeechSynthesisUtteranceClient() { }
41 }; 42 };
42 43
43 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance final : public GarbageCol lectedFinalized<PlatformSpeechSynthesisUtterance> { 44 class PLATFORM_EXPORT PlatformSpeechSynthesisUtterance final : public GarbageCol lectedFinalized<PlatformSpeechSynthesisUtterance> {
44 public: 45 public:
45 static PlatformSpeechSynthesisUtterance* create(PlatformSpeechSynthesisUtter anceClient*); 46 static PlatformSpeechSynthesisUtterance* create(PlatformSpeechSynthesisUtter anceClient*);
46 47
47 const String& text() const { return m_text; } 48 const String& text() const { return m_text; }
48 void setText(const String& text) { m_text = text; } 49 void setText(const String& text) { m_text = text; }
49 50
50 const String& lang() const { return m_lang; } 51 const String& lang() const { return m_lang; }
51 void setLang(const String& lang) { m_lang = lang; } 52 void setLang(const String& lang) { m_lang = lang; }
52 53
53 PlatformSpeechSynthesisVoice* voice() const { return m_voice; } 54 PlatformSpeechSynthesisVoice* voice() const { return m_voice; }
54 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; } 55 void setVoice(PlatformSpeechSynthesisVoice* voice) { m_voice = voice; }
55 56
56 // Range = [0, 1] where 1 is the default. 57 // Range = [0, 1] where 1 is the default.
57 float volume() const { return m_volume; } 58 float volume() const { return m_volume; }
58 void setVolume(float volume) { m_volume = std::max(std::min(1.0f, volume), 0 .0f); } 59 void setVolume(float volume) { m_volume = clampTo(volume, 0.0f, 1.0f); }
59 60
60 // Range = [0.1, 10] where 1 is the default. 61 // Range = [0.1, 10] where 1 is the default.
61 float rate() const { return m_rate; } 62 float rate() const { return m_rate; }
62 void setRate(float rate) { m_rate = std::max(std::min(10.0f, rate), 0.1f); } 63 void setRate(float rate) { m_rate = clampTo(rate, 0.1f, 10.0f); }
63 64
64 // Range = [0, 2] where 1 is the default. 65 // Range = [0, 2] where 1 is the default.
65 float pitch() const { return m_pitch; } 66 float pitch() const { return m_pitch; }
66 void setPitch(float pitch) { m_pitch = std::max(std::min(2.0f, pitch), 0.0f) ; } 67 void setPitch(float pitch) { m_pitch = clampTo(pitch, 0.0f, 2.0f); }
67 68
68 double startTime() const { return m_startTime; } 69 double startTime() const { return m_startTime; }
69 void setStartTime(double startTime) { m_startTime = startTime; } 70 void setStartTime(double startTime) { m_startTime = startTime; }
70 71
71 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; } 72 PlatformSpeechSynthesisUtteranceClient* client() const { return m_client; }
72 73
73 DECLARE_TRACE(); 74 DECLARE_TRACE();
74 75
75 private: 76 private:
76 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*); 77 explicit PlatformSpeechSynthesisUtterance(PlatformSpeechSynthesisUtteranceCl ient*);
77 78
78 Member<PlatformSpeechSynthesisUtteranceClient> m_client; 79 Member<PlatformSpeechSynthesisUtteranceClient> m_client;
79 String m_text; 80 String m_text;
80 String m_lang; 81 String m_lang;
81 Member<PlatformSpeechSynthesisVoice> m_voice; 82 Member<PlatformSpeechSynthesisVoice> m_voice;
82 float m_volume; 83 float m_volume;
83 float m_rate; 84 float m_rate;
84 float m_pitch; 85 float m_pitch;
85 double m_startTime; 86 double m_startTime;
86 }; 87 };
87 88
88 } // namespace blink 89 } // namespace blink
89 90
90 #endif // PlatformSpeechSynthesisUtterance_h 91 #endif // PlatformSpeechSynthesisUtterance_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698