| Index: Source/modules/speech/SpeechSynthesis.cpp
|
| diff --git a/Source/modules/speech/SpeechSynthesis.cpp b/Source/modules/speech/SpeechSynthesis.cpp
|
| index 5c60959595bc82f072253e395b84043edff84710..2a989a9514d29873f77f26251ed9f35517cc7e02 100644
|
| --- a/Source/modules/speech/SpeechSynthesis.cpp
|
| +++ b/Source/modules/speech/SpeechSynthesis.cpp
|
| @@ -34,11 +34,9 @@
|
|
|
| namespace WebCore {
|
|
|
| -DEFINE_GC_INFO(SpeechSynthesis);
|
| -
|
| -PassRefPtrWillBeRawPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext* context)
|
| -{
|
| - return adoptRefCountedWillBeRefCountedGarbageCollected(new SpeechSynthesis(context));
|
| +PassRefPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext* context)
|
| +{
|
| + return adoptRef(new SpeechSynthesis(context));
|
| }
|
|
|
| SpeechSynthesis::SpeechSynthesis(ExecutionContext* context)
|
| @@ -67,7 +65,7 @@
|
| dispatchEvent(Event::create(EventTypeNames::voiceschanged));
|
| }
|
|
|
| -const WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices()
|
| +const Vector<RefPtr<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices()
|
| {
|
| if (m_voiceList.size())
|
| return m_voiceList;
|
| @@ -127,7 +125,7 @@
|
| {
|
| // Remove all the items from the utterance queue.
|
| // Hold on to the current utterance so the platform synthesizer can have a chance to clean up.
|
| - RefPtrWillBeMember<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
|
| + RefPtr<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
|
| m_utteranceQueue.clear();
|
| m_platformSpeechSynthesizer->cancel();
|
| current = 0;
|
| @@ -164,7 +162,7 @@
|
| fireEvent(errorOccurred ? EventTypeNames::error : EventTypeNames::end, utterance, 0, String());
|
|
|
| if (m_utteranceQueue.size()) {
|
| - RefPtrWillBeMember<SpeechSynthesisUtterance> firstUtterance = m_utteranceQueue.first();
|
| + RefPtr<SpeechSynthesisUtterance> firstUtterance = m_utteranceQueue.first();
|
| ASSERT(firstUtterance == utterance);
|
| if (firstUtterance == utterance)
|
| m_utteranceQueue.removeFirst();
|
| @@ -229,11 +227,4 @@
|
| return EventTargetNames::SpeechSynthesisUtterance;
|
| }
|
|
|
| -void SpeechSynthesis::trace(Visitor* visitor)
|
| -{
|
| - visitor->trace(m_voiceList);
|
| - visitor->trace(m_currentSpeechUtterance);
|
| - visitor->trace(m_utteranceQueue);
|
| -}
|
| -
|
| } // namespace WebCore
|
|
|