Oilpan: Move all supplements of Page, Document, and WorkerClients to the managed heap.

Source/core/speech/SpeechInput.cpp

 /*
  * Copyright (C) 2010 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
     , m_nextListenerId(1)
 {
     m_client->setListener(this);
 }
 
 SpeechInput::~SpeechInput()
 {
     m_client->setListener(0);
 }
 
-PassOwnPtr<SpeechInput> SpeechInput::create(PassOwnPtr<SpeechInputClient> client)
+PassOwnPtrWillBeRawPtr<SpeechInput> SpeechInput::create(PassOwnPtr<SpeechInputClient> client)
 {
-    return adoptPtr(new SpeechInput(client));
+    return adoptPtrWillBeNoop(new SpeechInput(client));
 }
 
-int SpeechInput::registerListener(InputFieldSpeechButtonElement* listener)
+int SpeechInput::registerListener(SpeechInputListener* listener)
 {
 #if defined(DEBUG)
     // Check if already present.
-    for (HashMap<int, InputFieldSpeechButtonElement*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    for (HashMap<int, SpeechInputListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
         ASSERT(it->value != listener);
 #endif
 
     m_listeners.add(m_nextListenerId, listener);
     return m_nextListenerId++;
 }
 
 void SpeechInput::unregisterListener(int listenerId)
 {
     if (m_listeners.contains(listenerId))
@@ skipping 40 matching lines @@
 {
     ASSERT(m_listeners.contains(listenerId));
     m_client->cancelRecognition(listenerId);
 }
 
 const char* SpeechInput::supplementName()
 {
     return "SpeechInput";
 }
 
+void SpeechInput::trace(Visitor* visitor)
+{
+    visitor->registerWeakMembers<SpeechInput, &SpeechInput::clearWeakMembers>(this);
+}
+
 void provideSpeechInputTo(Page& page, PassOwnPtr<SpeechInputClient> client)
 {
     SpeechInput::provideTo(page, SpeechInput::supplementName(), SpeechInput::create(client));
 }
 
 void SpeechInput::clearWeakMembers(Visitor* visitor)
 {
     Vector<int> deadListenerIds;
-    HashMap<int, InputFieldSpeechButtonElement*>::const_iterator end = m_listeners.end();
-    for (HashMap<int, InputFieldSpeechButtonElement*>::const_iterator it = m_listeners.begin(); it != end; ++it) {
+    WillBeHeapHashMap<int, RawPtrWillBeWeakMember<SpeechInputListener> >::const_iterator end = m_listeners.end();
+    for (WillBeHeapHashMap<int, RawPtrWillBeWeakMember<SpeechInputListener> >::const_iterator it = m_listeners.begin(); it != end; ++it) {
         if (!visitor->isAlive(it->value)) {
             deadListenerIds.append(it->key);
             m_client->cancelRecognition(it->key);
         }
     }
     for (unsigned i = 0; i < deadListenerIds.size(); ++i)
         m_listeners.remove(deadListenerIds[i]);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INPUT_SPEECH)