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

Unified Diff: Source/modules/speech/SpeechSynthesis.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/speech/SpeechSynthesis.h ('k') | Source/modules/speech/SpeechSynthesis.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« 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