Oilpan: move platform speech objects to the heap.

Source/platform/speech/PlatformSpeechSynthesizer.cpp

 /*
  * Copyright (C) 2013 Apple Computer, 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 18 matching lines @@
 #include "platform/exported/WebSpeechSynthesizerClientImpl.h"
 #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSpeechSynthesisUtterance.h"
 #include "public/platform/WebSpeechSynthesizer.h"
 #include "public/platform/WebSpeechSynthesizerClient.h"
 #include "wtf/RetainPtr.h"
 
 namespace WebCore {
 
-PassOwnPtr<PlatformSpeechSynthesizer> PlatformSpeechSynthesizer::create(PlatformSpeechSynthesizerClient* client)
+PlatformSpeechSynthesizer* PlatformSpeechSynthesizer::create(PlatformSpeechSynthesizerClient* client)
 {
-    OwnPtr<PlatformSpeechSynthesizer> synthesizer = adoptPtr(new PlatformSpeechSynthesizer(client));
+    PlatformSpeechSynthesizer* synthesizer = new PlatformSpeechSynthesizer(client);
     synthesizer->initializeVoiceList();
-    return synthesizer.release();
+    return synthesizer;
 }
 
 PlatformSpeechSynthesizer::PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient* client)
     : m_speechSynthesizerClient(client)
 {
-    m_webSpeechSynthesizerClient = adoptPtr(new WebSpeechSynthesizerClientImpl(this, client));
-    m_webSpeechSynthesizer = adoptPtr(blink::Platform::current()->createSpeechSynthesizer(m_webSpeechSynthesizerClient.get()));
+    m_webSpeechSynthesizerClient = new WebSpeechSynthesizerClientImpl(this, client);
+    m_webSpeechSynthesizer = adoptPtr(blink::Platform::current()->createSpeechSynthesizer(m_webSpeechSynthesizerClient));
 }
 
 PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer()
 {
 }
 
-void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+void PlatformSpeechSynthesizer::speak(PlatformSpeechSynthesisUtterance* utterance)
 {
     if (!m_webSpeechSynthesizer || !m_webSpeechSynthesizerClient)
         return;
 
     m_webSpeechSynthesizer->speak(blink::WebSpeechSynthesisUtterance(utterance));
 }
 
 void PlatformSpeechSynthesizer::pause()
 {
     if (m_webSpeechSynthesizer.get())
         m_webSpeechSynthesizer->pause();
 }
 
 void PlatformSpeechSynthesizer::resume()
 {
     if (m_webSpeechSynthesizer.get())
         m_webSpeechSynthesizer->resume();
 }
 
 void PlatformSpeechSynthesizer::cancel()
 {
     if (m_webSpeechSynthesizer.get())
         m_webSpeechSynthesizer->cancel();
 }
 
-void PlatformSpeechSynthesizer::setVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice> >& voices)
+void PlatformSpeechSynthesizer::setVoiceList(HeapVector<Member<PlatformSpeechSynthesisVoice> >& voices)
 {
     m_voiceList = voices;
 }
 
 void PlatformSpeechSynthesizer::initializeVoiceList()
 {
     if (m_webSpeechSynthesizer.get())
         m_webSpeechSynthesizer->updateVoiceList();
 }
 
+void PlatformSpeechSynthesizer::trace(Visitor* visitor)
+{
+    visitor->trace(m_speechSynthesizerClient);
+    visitor->trace(m_voiceList);
+    visitor->trace(m_webSpeechSynthesizerClient);
+}
+
 } // namespace WebCore