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

Side by Side Diff: Source/modules/speech/SpeechSynthesisUtterance.cpp

Issue 20300002: Fix trailing whitespace in .cpp, .h, and .idl files (ex. Source/core) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple 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 #include "config.h" 26 #include "config.h"
27 #include "modules/speech/SpeechSynthesisUtterance.h" 27 #include "modules/speech/SpeechSynthesisUtterance.h"
28 28
29 namespace WebCore { 29 namespace WebCore {
30 30
31 PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ScriptExec utionContext* context, const String& text) 31 PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ScriptExec utionContext* context, const String& text)
32 { 32 {
33 return adoptRef(new SpeechSynthesisUtterance(context, text)); 33 return adoptRef(new SpeechSynthesisUtterance(context, text));
34 } 34 }
35 35
36 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ScriptExecutionContext* conte xt, const String& text) 36 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ScriptExecutionContext* conte xt, const String& text)
37 : ContextLifecycleObserver(context) 37 : ContextLifecycleObserver(context)
38 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) 38 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this))
39 { 39 {
40 ScriptWrappable::init(this); 40 ScriptWrappable::init(this);
41 m_platformUtterance->setText(text); 41 m_platformUtterance->setText(text);
42 } 42 }
43 43
44 SpeechSynthesisUtterance::~SpeechSynthesisUtterance() 44 SpeechSynthesisUtterance::~SpeechSynthesisUtterance()
45 { 45 {
46 m_platformUtterance->setClient(0); 46 m_platformUtterance->setClient(0);
47 } 47 }
48 48
49 ScriptExecutionContext* SpeechSynthesisUtterance::scriptExecutionContext() const 49 ScriptExecutionContext* SpeechSynthesisUtterance::scriptExecutionContext() const
50 { 50 {
51 return ContextLifecycleObserver::scriptExecutionContext(); 51 return ContextLifecycleObserver::scriptExecutionContext();
52 } 52 }
53 53
54 const AtomicString& SpeechSynthesisUtterance::interfaceName() const 54 const AtomicString& SpeechSynthesisUtterance::interfaceName() const
55 { 55 {
56 return eventNames().interfaceForSpeechSynthesisUtterance; 56 return eventNames().interfaceForSpeechSynthesisUtterance;
57 } 57 }
58 58
59 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const 59 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const
60 { 60 {
61 return m_voice.get(); 61 return m_voice.get();
62 } 62 }
63 63
64 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) 64 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice)
65 { 65 {
66 // Cache our own version of the SpeechSynthesisVoice so that we don't have t o do some lookup 66 // Cache our own version of the SpeechSynthesisVoice so that we don't have t o do some lookup
67 // to go from the platform voice back to the speech synthesis voice in the r ead property. 67 // to go from the platform voice back to the speech synthesis voice in the r ead property.
68 m_voice = voice; 68 m_voice = voice;
69 69
70 if (voice) 70 if (voice)
71 m_platformUtterance->setVoice(voice->platformVoice()); 71 m_platformUtterance->setVoice(voice->platformVoice());
72 } 72 }
73 73
74 } // namespace WebCore 74 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechSynthesisEvent.idl ('k') | Source/modules/speech/SpeechSynthesisUtterance.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698