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

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

 /*
  * Copyright (C) 2012 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 31 matching lines @@
 class RTCPeerConnection;
 class WebRTCDataChannelHandler;
 class WebRTCPeerConnectionHandler;
 struct WebRTCDataChannelInit;
 
 class MODULES_EXPORT RTCDataChannel final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<RTCDataChannel>
     , WTF_NON_EXPORTED_BASE(public WebRTCDataChannelHandlerClient) {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCDataChannel);
     DEFINE_WRAPPERTYPEINFO();
+    USING_PRE_FINALIZER(RTCDataChannel, dispose);
 public:
     static RTCDataChannel* create(ExecutionContext*, PassOwnPtr<WebRTCDataChannelHandler>);
     static RTCDataChannel* create(ExecutionContext*, WebRTCPeerConnectionHandler*, const String& label, const WebRTCDataChannelInit&, ExceptionState&);
     ~RTCDataChannel() override;
 
     ReadyState getHandlerState() const;
 
     String label() const;
 
     // DEPRECATED
@@ skipping 24 matching lines @@
     DEFINE_ATTRIBUTE_EVENT_LISTENER(open);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(bufferedamountlow);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
 
     // EventTarget
     const AtomicString& interfaceName() const override;
     ExecutionContext* getExecutionContext() const override;
 
-    // Oilpan: need to eagerly finalize m_handler
-    EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
     // WebRTCDataChannelHandlerClient
     void didChangeReadyState(WebRTCDataChannelHandlerClient::ReadyState) override;
     void didDecreaseBufferedAmount(unsigned) override;
     void didReceiveStringData(const WebString&) override;
     void didReceiveRawData(const char*, size_t) override;
     void didDetectError() override;
 
 private:
     RTCDataChannel(ExecutionContext*, PassOwnPtr<WebRTCDataChannelHandler>);
+    void dispose();
 
     void scheduleDispatchEvent(Event*);
     void scheduledEventTimerFired(Timer<RTCDataChannel>*);
 
     Member<ExecutionContext> m_executionContext;
 
     OwnPtr<WebRTCDataChannelHandler> m_handler;
 
     WebRTCDataChannelHandlerClient::ReadyState m_readyState;
 
     enum BinaryType {
         BinaryTypeBlob,
         BinaryTypeArrayBuffer
     };
     BinaryType m_binaryType;
 
     Timer<RTCDataChannel> m_scheduledEventTimer;
     HeapVector<Member<Event>> m_scheduledEvents;
 
     unsigned m_bufferedAmountLowThreshold;
 
     FRIEND_TEST_ALL_PREFIXES(RTCDataChannelTest, BufferedAmountLow);
 };
 
 } // namespace blink
 
 #endif // RTCDataChannel_h