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

third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.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
@@ skipping 51 matching lines @@
 class VoidCallback;
 
 class RTCPeerConnection final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<RTCPeerConnection>
     , public WebRTCPeerConnectionHandlerClient
     , public ActiveScriptWrappable
     , public ActiveDOMObject {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCPeerConnection);
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
+    USING_PRE_FINALIZER(RTCPeerConnection, dispose);
 public:
     // TODO(hbos): Create with expired RTCCertificate should fail, see crbug.com/565278.
     static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&);
     ~RTCPeerConnection() override;
 
     ScriptPromise createOffer(ScriptState*, const RTCOfferOptions&);
     ScriptPromise createOffer(ScriptState*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*, const Dictionary&);
 
     ScriptPromise createAnswer(ScriptState*, const RTCAnswerOptions&);
     ScriptPromise createAnswer(ScriptState*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*, const Dictionary&);
@@ skipping 72 matching lines @@
     void resume() override;
     void stop() override;
 
     // ActiveScriptWrappable
     // We keep the this object alive until either stopped or closed.
     bool hasPendingActivity() const final
     {
         return !m_closed && !m_stopped;
     }
 
-    // Oilpan: need to eagerly finalize m_peerHandler
-    EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
     typedef Function<bool()> BoolFunction;
     class EventWrapper : public GarbageCollectedFinalized<EventWrapper> {
     public:
         EventWrapper(Event*, PassOwnPtr<BoolFunction>);
         // Returns true if |m_setupFunction| returns true or it is null.
         // |m_event| will only be fired if setup() returns true;
         bool setup();
 
         DECLARE_TRACE();
 
         Member<Event> m_event;
 
     private:
         OwnPtr<BoolFunction> m_setupFunction;
     };
 
     RTCPeerConnection(ExecutionContext*, RTCConfiguration*, WebMediaConstraints, ExceptionState&);
+    void dispose();
 
     void scheduleDispatchEvent(Event*);
     void scheduleDispatchEvent(Event*, PassOwnPtr<BoolFunction>);
     void dispatchScheduledEvent();
     bool hasLocalStreamWithTrackId(const String& trackId);
 
     void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState);
     void changeIceGatheringState(WebRTCPeerConnectionHandlerClient::ICEGatheringState);
     // Changes the state immediately; does not fire an event.
     // Returns true if the state was changed.
@@ skipping 15 matching lines @@
     Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner;
     HeapVector<Member<EventWrapper>> m_scheduledEvents;
 
     bool m_stopped;
     bool m_closed;
 };
 
 } // namespace blink
 
 #endif // RTCPeerConnection_h