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

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

Issue 864533002: Fix template angle bracket syntax in modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return ContextLifecycleObserver::executionContext(); 56 return ContextLifecycleObserver::executionContext();
57 } 57 }
58 58
59 void SpeechSynthesis::voicesDidChange() 59 void SpeechSynthesis::voicesDidChange()
60 { 60 {
61 m_voiceList.clear(); 61 m_voiceList.clear();
62 if (executionContext() && !executionContext()->activeDOMObjectsAreStopped()) 62 if (executionContext() && !executionContext()->activeDOMObjectsAreStopped())
63 dispatchEvent(Event::create(EventTypeNames::voiceschanged)); 63 dispatchEvent(Event::create(EventTypeNames::voiceschanged));
64 } 64 }
65 65
66 const HeapVector<Member<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices() 66 const HeapVector<Member<SpeechSynthesisVoice>>& SpeechSynthesis::getVoices()
67 { 67 {
68 if (m_voiceList.size()) 68 if (m_voiceList.size())
69 return m_voiceList; 69 return m_voiceList;
70 70
71 // If the voiceList is empty, that's the cue to get the voices from the plat form again. 71 // If the voiceList is empty, that's the cue to get the voices from the plat form again.
72 const HeapVector<Member<PlatformSpeechSynthesisVoice> >& platformVoices = m_ platformSpeechSynthesizer->voiceList(); 72 const HeapVector<Member<PlatformSpeechSynthesisVoice>>& platformVoices = m_p latformSpeechSynthesizer->voiceList();
73 size_t voiceCount = platformVoices.size(); 73 size_t voiceCount = platformVoices.size();
74 for (size_t k = 0; k < voiceCount; k++) 74 for (size_t k = 0; k < voiceCount; k++)
75 m_voiceList.append(SpeechSynthesisVoice::create(platformVoices[k].get()) ); 75 m_voiceList.append(SpeechSynthesisVoice::create(platformVoices[k].get()) );
76 76
77 return m_voiceList; 77 return m_voiceList;
78 } 78 }
79 79
80 bool SpeechSynthesis::speaking() const 80 bool SpeechSynthesis::speaking() const
81 { 81 {
82 // If we have a current speech utterance, then that means we're assumed to b e in a speaking state. 82 // If we have a current speech utterance, then that means we're assumed to b e in a speaking state.
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 { 236 {
237 visitor->trace(m_platformSpeechSynthesizer); 237 visitor->trace(m_platformSpeechSynthesizer);
238 visitor->trace(m_voiceList); 238 visitor->trace(m_voiceList);
239 visitor->trace(m_utteranceQueue); 239 visitor->trace(m_utteranceQueue);
240 PlatformSpeechSynthesizerClient::trace(visitor); 240 PlatformSpeechSynthesizerClient::trace(visitor);
241 RefCountedGarbageCollectedEventTargetWithInlineData<SpeechSynthesis>::trace( visitor); 241 RefCountedGarbageCollectedEventTargetWithInlineData<SpeechSynthesis>::trace( visitor);
242 ContextLifecycleObserver::trace(visitor); 242 ContextLifecycleObserver::trace(visitor);
243 } 243 }
244 244
245 } // namespace blink 245 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698