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

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

Issue 163493003: Revert of Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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 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
(...skipping 10 matching lines...) Expand all
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 DEFINE_GC_INFO(SpeechSynthesisUtterance); 31 PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ExecutionC ontext* context, const String& text)
32
33 PassRefPtrWillBeRawPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::creat e(ExecutionContext* context, const String& text)
34 { 32 {
35 return adoptRefCountedWillBeRefCountedGarbageCollected(new SpeechSynthesisUt terance(context, text)); 33 return adoptRef(new SpeechSynthesisUtterance(context, text));
36 } 34 }
37 35
38 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context, co nst String& text) 36 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context, co nst String& text)
39 : ContextLifecycleObserver(context) 37 : ContextLifecycleObserver(context)
40 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) 38 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this))
41 { 39 {
42 ScriptWrappable::init(this); 40 ScriptWrappable::init(this);
43 m_platformUtterance->setText(text); 41 m_platformUtterance->setText(text);
44 } 42 }
45 43
(...skipping 20 matching lines...) Expand all
66 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) 64 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice)
67 { 65 {
68 // 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
69 // 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.
70 m_voice = voice; 68 m_voice = voice;
71 69
72 if (voice) 70 if (voice)
73 m_platformUtterance->setVoice(voice->platformVoice()); 71 m_platformUtterance->setVoice(voice->platformVoice());
74 } 72 }
75 73
76 void SpeechSynthesisUtterance::trace(Visitor* visitor)
77 {
78 visitor->trace(m_voice);
79 }
80
81 } // namespace WebCore 74 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechSynthesisUtterance.h ('k') | Source/modules/speech/SpeechSynthesisUtterance.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698