Oilpan: Replace EAGERLY_FINALIZE in EventTarget's hierarchy with pre-finalizers

third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h

 /*
  * Copyright (C) 2013 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:
  * 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 27 matching lines @@
 class WebRTCDTMFSenderHandler;
 class WebRTCPeerConnectionHandler;
 
 class RTCDTMFSender final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<RTCDTMFSender>
     , public WebRTCDTMFSenderHandlerClient
     , public ActiveDOMObject {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCDTMFSender);
     USING_GARBAGE_COLLECTED_MIXIN(RTCDTMFSender);
     DEFINE_WRAPPERTYPEINFO();
+    USING_PRE_FINALIZER(RTCDTMFSender, dispose);
 public:
     static RTCDTMFSender* create(ExecutionContext*, WebRTCPeerConnectionHandler*, MediaStreamTrack*, ExceptionState&);
     ~RTCDTMFSender() override;
 
     bool canInsertDTMF() const;
     MediaStreamTrack* track() const;
     String toneBuffer() const;
     int duration() const { return m_duration; }
     int interToneGap() const { return m_interToneGap; }
 
     void insertDTMF(const String& tones, ExceptionState&);
     void insertDTMF(const String& tones, int duration, ExceptionState&);
     void insertDTMF(const String& tones, int duration, int interToneGap, ExceptionState&);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange);
 
     // EventTarget
     const AtomicString& interfaceName() const override;
     ExecutionContext* getExecutionContext() const override;
 
     // ActiveDOMObject
     void stop() override;
 
-    // Oilpan: need to eagerly finalize m_handler
-    EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
     RTCDTMFSender(ExecutionContext*, MediaStreamTrack*, PassOwnPtr<WebRTCDTMFSenderHandler>);
+    void dispose();
 
     void scheduleDispatchEvent(Event*);
     void scheduledEventTimerFired(Timer<RTCDTMFSender>*);
 
     // WebRTCDTMFSenderHandlerClient
     void didPlayTone(const WebString&) override;
 
     Member<MediaStreamTrack> m_track;
     int m_duration;
     int m_interToneGap;
 
     OwnPtr<WebRTCDTMFSenderHandler> m_handler;
 
     bool m_stopped;
 
     Timer<RTCDTMFSender> m_scheduledEventTimer;
     HeapVector<Member<Event>> m_scheduledEvents;
 };
 
 } // namespace blink
 
 #endif // RTCDTMFSender_h