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

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

Issue 330463002: Revert of Enable Oilpan by default in modules/speech/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/modules/speech/SpeechSynthesis.h ('k') | Source/modules/speech/SpeechSynthesis.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
27 #include "modules/speech/SpeechSynthesis.h" 27 #include "modules/speech/SpeechSynthesis.h"
28 28
29 #include "bindings/v8/ExceptionState.h" 29 #include "bindings/v8/ExceptionState.h"
30 #include "core/dom/ExecutionContext.h" 30 #include "core/dom/ExecutionContext.h"
31 #include "modules/speech/SpeechSynthesisEvent.h" 31 #include "modules/speech/SpeechSynthesisEvent.h"
32 #include "platform/speech/PlatformSpeechSynthesisVoice.h" 32 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
33 #include "wtf/CurrentTime.h" 33 #include "wtf/CurrentTime.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 SpeechSynthesis* SpeechSynthesis::create(ExecutionContext* context) 37 PassRefPtrWillBeRawPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext * context)
38 { 38 {
39 return adoptRefCountedGarbageCollected(new SpeechSynthesis(context)); 39 return adoptRefWillBeRefCountedGarbageCollected(new SpeechSynthesis(context) );
40 } 40 }
41 41
42 SpeechSynthesis::SpeechSynthesis(ExecutionContext* context) 42 SpeechSynthesis::SpeechSynthesis(ExecutionContext* context)
43 : ContextLifecycleObserver(context) 43 : ContextLifecycleObserver(context)
44 , m_platformSpeechSynthesizer(PlatformSpeechSynthesizer::create(this)) 44 , m_platformSpeechSynthesizer(PlatformSpeechSynthesizer::create(this))
45 , m_isPaused(false) 45 , m_isPaused(false)
46 { 46 {
47 ScriptWrappable::init(this); 47 ScriptWrappable::init(this);
48 } 48 }
49 49
50 void SpeechSynthesis::setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesize r> synthesizer) 50 void SpeechSynthesis::setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesize r> synthesizer)
51 { 51 {
52 m_platformSpeechSynthesizer = synthesizer; 52 m_platformSpeechSynthesizer = synthesizer;
53 } 53 }
54 54
55 ExecutionContext* SpeechSynthesis::executionContext() const 55 ExecutionContext* SpeechSynthesis::executionContext() const
56 { 56 {
57 return ContextLifecycleObserver::executionContext(); 57 return ContextLifecycleObserver::executionContext();
58 } 58 }
59 59
60 void SpeechSynthesis::voicesDidChange() 60 void SpeechSynthesis::voicesDidChange()
61 { 61 {
62 m_voiceList.clear(); 62 m_voiceList.clear();
63 if (!executionContext()->activeDOMObjectsAreStopped()) 63 if (!executionContext()->activeDOMObjectsAreStopped())
64 dispatchEvent(Event::create(EventTypeNames::voiceschanged)); 64 dispatchEvent(Event::create(EventTypeNames::voiceschanged));
65 } 65 }
66 66
67 const HeapVector<Member<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices() 67 const WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> >& SpeechSynthes is::getVoices()
68 { 68 {
69 if (m_voiceList.size()) 69 if (m_voiceList.size())
70 return m_voiceList; 70 return m_voiceList;
71 71
72 // If the voiceList is empty, that's the cue to get the voices from the plat form again. 72 // If the voiceList is empty, that's the cue to get the voices from the plat form again.
73 const Vector<RefPtr<PlatformSpeechSynthesisVoice> >& platformVoices = m_plat formSpeechSynthesizer->voiceList(); 73 const Vector<RefPtr<PlatformSpeechSynthesisVoice> >& platformVoices = m_plat formSpeechSynthesizer->voiceList();
74 size_t voiceCount = platformVoices.size(); 74 size_t voiceCount = platformVoices.size();
75 for (size_t k = 0; k < voiceCount; k++) 75 for (size_t k = 0; k < voiceCount; k++)
76 m_voiceList.append(SpeechSynthesisVoice::create(platformVoices[k])); 76 m_voiceList.append(SpeechSynthesisVoice::create(platformVoices[k]));
77 77
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 void SpeechSynthesis::fireEvent(const AtomicString& type, SpeechSynthesisUtteran ce* utterance, unsigned long charIndex, const String& name) 146 void SpeechSynthesis::fireEvent(const AtomicString& type, SpeechSynthesisUtteran ce* utterance, unsigned long charIndex, const String& name)
147 { 147 {
148 if (!executionContext()->activeDOMObjectsAreStopped()) 148 if (!executionContext()->activeDOMObjectsAreStopped())
149 utterance->dispatchEvent(SpeechSynthesisEvent::create(type, charIndex, ( currentTime() - utterance->startTime()), name)); 149 utterance->dispatchEvent(SpeechSynthesisEvent::create(type, charIndex, ( currentTime() - utterance->startTime()), name));
150 } 150 }
151 151
152 void SpeechSynthesis::handleSpeakingCompleted(SpeechSynthesisUtterance* utteranc e, bool errorOccurred) 152 void SpeechSynthesis::handleSpeakingCompleted(SpeechSynthesisUtterance* utteranc e, bool errorOccurred)
153 { 153 {
154 ASSERT(utterance); 154 ASSERT(utterance);
155 155
156 // Keep the utterance around long enough to fire an event on it in case m_ut teranceQueue
157 // is holding the last reference to it.
158 RefPtrWillBeRawPtr<SpeechSynthesisUtterance> protect(utterance);
159
156 bool didJustFinishCurrentUtterance = false; 160 bool didJustFinishCurrentUtterance = false;
157 // If the utterance that completed was the one we're currently speaking, 161 // If the utterance that completed was the one we're currently speaking,
158 // remove it from the queue and start speaking the next one. 162 // remove it from the queue and start speaking the next one.
159 if (utterance == currentSpeechUtterance()) { 163 if (utterance == currentSpeechUtterance()) {
160 m_utteranceQueue.removeFirst(); 164 m_utteranceQueue.removeFirst();
161 didJustFinishCurrentUtterance = true; 165 didJustFinishCurrentUtterance = true;
162 } 166 }
163 167
164 // Always fire the event, because the platform may have asynchronously 168 // Always fire the event, because the platform may have asynchronously
165 // sent an event on an utterance before it got the message that we 169 // sent an event on an utterance before it got the message that we
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 238 }
235 239
236 void SpeechSynthesis::trace(Visitor* visitor) 240 void SpeechSynthesis::trace(Visitor* visitor)
237 { 241 {
238 visitor->trace(m_voiceList); 242 visitor->trace(m_voiceList);
239 visitor->trace(m_utteranceQueue); 243 visitor->trace(m_utteranceQueue);
240 EventTargetWithInlineData::trace(visitor); 244 EventTargetWithInlineData::trace(visitor);
241 } 245 }
242 246
243 } // namespace WebCore 247 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechSynthesis.h ('k') | Source/modules/speech/SpeechSynthesis.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698