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

Source/core/speech/SpeechInput.h

 /*
  * 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 25 matching lines @@
 #include "core/page/Page.h"
 #include "core/speech/SpeechInputListener.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 
 namespace WebCore {
 
 class IntRect;
 class SecurityOrigin;
 class SpeechInputClient;
-class SpeechInputListener;
-class InputFieldSpeechButtonElement;
 
 // This class connects the input elements requiring speech input with the platform specific
 // speech recognition engine. It provides methods for the input elements to activate speech
 // recognition and methods for the speech recognition engine to return back the results.
-class SpeechInput FINAL : public SpeechInputListener, public Supplement<Page> {
+class SpeechInput FINAL : public NoBaseWillBeGarbageCollectedFinalized<SpeechInput>, public SpeechInputListener, public WillBeHeapSupplement<Page> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechInput);
     WTF_MAKE_NONCOPYABLE(SpeechInput);
 public:
     virtual ~SpeechInput();
 
-    static PassOwnPtr<SpeechInput> create(PassOwnPtr<SpeechInputClient>);
+    static PassOwnPtrWillBeRawPtr<SpeechInput> create(PassOwnPtr<SpeechInputClient>);
     static const char* supplementName();
-    static SpeechInput* from(Page* page) { return static_cast<SpeechInput*>(Supplement<Page>::from(page, supplementName())); }
+    static SpeechInput* from(Page* page) { return static_cast<SpeechInput*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
 
     // Generates a unique ID for the given listener to be used for speech requests.
     // This should be the first call made by listeners before anything else.
-    int registerListener(InputFieldSpeechButtonElement*);
+    int registerListener(SpeechInputListener*);
 
     // Invoked when the listener is done with recording or getting destroyed.
     // Failure to unregister may result in crashes if there were any pending speech events.
     void unregisterListener(int);
 
     // Methods invoked by the input elements.
     bool startRecognition(int listenerId, const IntRect& elementRect, const AtomicString& language, const String& grammar, SecurityOrigin*);
     void stopRecording(int);
     void cancelRecognition(int);
 
     // SpeechInputListener methods.
     virtual void didCompleteRecording(int) OVERRIDE;
     virtual void didCompleteRecognition(int) OVERRIDE;
     virtual void setRecognitionResult(int, const SpeechInputResultArray&) OVERRIDE;
 
-    virtual void trace(Visitor*) OVERRIDE { }
+    virtual void trace(Visitor*) OVERRIDE;
     void clearWeakMembers(Visitor*);
 
 private:
     explicit SpeechInput(PassOwnPtr<SpeechInputClient>);
 
     OwnPtr<SpeechInputClient> m_client;
-    // FIXME: Oilpan: go back to using SpeechInputListener as the type when
-    // all SpeechInputListeners (SpeechInput and InputFieldSpeechButtonElement)
-    // have been moved to the oilpan heap. At that point SpeechInputListener
-    // will be a GarbageCollectedMixin.
-    HashMap<int, InputFieldSpeechButtonElement*> m_listeners;
+    WillBeHeapHashMap<int, RawPtrWillBeWeakMember<SpeechInputListener> > m_listeners;

[Mads Ager (chromium), 2014/04/29 14:56:09]

Thank you!!! :)

     int m_nextListenerId;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(INPUT_SPEECH)
 
 #endif // SpeechInput_h