Move speech module over to Oilpan.

Source/modules/speech/SpeechSynthesis.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "modules/speech/SpeechSynthesis.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/speech/SpeechSynthesisEvent.h"
 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
 #include "wtf/CurrentTime.h"
 
 namespace WebCore {
 
-PassRefPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext* context)
+DEFINE_GC_INFO(SpeechSynthesis);
+
+PassRefPtrWillBeRawPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext* context)
 {
-    return adoptRef(new SpeechSynthesis(context));
+    return adoptRefWillBeNoop(new SpeechSynthesis(context));
 }
 
 SpeechSynthesis::SpeechSynthesis(ExecutionContext* context)
     : ContextLifecycleObserver(context)
     , m_platformSpeechSynthesizer(PlatformSpeechSynthesizer::create(this))
     , m_currentSpeechUtterance(0)
     , m_isPaused(false)
 {
     ScriptWrappable::init(this);
 }
 
 void SpeechSynthesis::setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesizer> synthesizer)
 {
     m_platformSpeechSynthesizer = synthesizer;
 }
 
 ExecutionContext* SpeechSynthesis::executionContext() const
 {
     return ContextLifecycleObserver::executionContext();
 }
 
 void SpeechSynthesis::voicesDidChange()
 {
     m_voiceList.clear();
     if (!executionContext()->activeDOMObjectsAreStopped())
         dispatchEvent(Event::create(EventTypeNames::voiceschanged));
 }
 
-const Vector<RefPtr<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices()
+const Vector<RefPtrWillBeMember<SpeechSynthesisVoice> >& SpeechSynthesis::getVoices()
 {
     if (m_voiceList.size())
         return m_voiceList;
 
     // If the voiceList is empty, that's the cue to get the voices from the platform again.
     const Vector<RefPtr<PlatformSpeechSynthesisVoice> >& platformVoices = m_platformSpeechSynthesizer->voiceList();
     size_t voiceCount = platformVoices.size();
     for (size_t k = 0; k < voiceCount; k++)
         m_voiceList.append(SpeechSynthesisVoice::create(platformVoices[k]));
 
@@ skipping 39 matching lines @@
 
     // If the queue was empty, speak this immediately and add it to the queue.
     if (m_utteranceQueue.size() == 1)
         startSpeakingImmediately(utterance);
 }
 
 void SpeechSynthesis::cancel()
 {
     // 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.
-    RefPtr<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
+    RefPtrWillBeMember<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
     m_utteranceQueue.clear();
     m_platformSpeechSynthesizer->cancel();
     current = 0;
 
     // The platform should have called back immediately and cleared the current utterance.
     ASSERT(!m_currentSpeechUtterance);
 }
 
 void SpeechSynthesis::pause()
 {
@@ skipping 16 matching lines @@
 
 void SpeechSynthesis::handleSpeakingCompleted(SpeechSynthesisUtterance* utterance, bool errorOccurred)
 {
     ASSERT(utterance);
     ASSERT(m_currentSpeechUtterance);
     m_currentSpeechUtterance = 0;
 
     fireEvent(errorOccurred ? EventTypeNames::error : EventTypeNames::end, utterance, 0, String());
 
     if (m_utteranceQueue.size()) {
-        RefPtr<SpeechSynthesisUtterance> firstUtterance = m_utteranceQueue.first();
+        RefPtrWillBeMember<SpeechSynthesisUtterance> firstUtterance = m_utteranceQueue.first();
         ASSERT(firstUtterance == utterance);
         if (firstUtterance == utterance)
             m_utteranceQueue.removeFirst();
 
         // Start the next job if there is one pending.
         if (!m_utteranceQueue.isEmpty())
             startSpeakingImmediately(m_utteranceQueue.first().get());
     }
 }
 
@@ skipping 44 matching lines @@
 {
     if (utterance->client())
         handleSpeakingCompleted(static_cast<SpeechSynthesisUtterance*>(utterance->client()), true);
 }
 
 const AtomicString& SpeechSynthesis::interfaceName() const
 {
     return EventTargetNames::SpeechSynthesisUtterance;
 }
 
+void SpeechSynthesis::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)

[haraken, 2014/02/12 05:18:45]

Is this #if needed?

[sof, 2014/02/12 07:48:51]

Think so; one will be a Vector<RefPtr>, the other a RawPtr<>.

+    visitor->trace(m_voiceList);
+    visitor->trace(m_currentSpeechUtterance);
+#endif
+    for (Deque<RefPtrWillBeMember<SpeechSynthesisUtterance> >::const_iterator it = m_utteranceQueue.begin(); it != m_utteranceQueue.end(); ++it)
+        visitor->trace(*it);

[haraken, 2014/02/12 05:18:45]

Can't you write this like visitor->trace(m_utteranceQueue) ? If no, we should
add the trace method to Handle.h.

[sof, 2014/02/12 07:48:51]

This is over the Deque<>; should we add a trace() method for it, but not have a
WillBeHeapDeque transition type?

[haraken, 2014/02/12 08:04:50]

I think we have trace() methods for Vector<Member> and HashSet<Member>, so it
would make sense to add a trace() method for Deque<Member> as well.

On the other hand, I begin to think that it's confusing to have trace() methods
for Vector<Member>, HashSet<Member> etc, since they shouldn't be used
(basically). They should be HeapVector<Member>, HashSet<Member> etc.

[sof, 2014/02/12 10:17:09]

Sorry, I spoke incorrectly. There is a Deque<> trace(), the problem here is/was
that the Deque<> will hold RefPtrs, which we cannot automatically trace.

I've updated the code to use the Deque's trace() (iff ENABLE(OILPAN).)

+}
+
 } // namespace WebCore