Index: Source/modules/mediastream/RTCDTMFSender.h |
diff --git a/Source/modules/mediastream/RTCDTMFSender.h b/Source/modules/mediastream/RTCDTMFSender.h |
index 7494a7d7f8038b9b669fb7b489a73d5cac9d9b31..0dbaaa98f188436aef15f07b0da06e4d19042079 100644 |
--- a/Source/modules/mediastream/RTCDTMFSender.h |
+++ b/Source/modules/mediastream/RTCDTMFSender.h |
@@ -43,10 +43,11 @@ namespace WebCore { |
class ExceptionState; |
class MediaStreamTrack; |
-class RTCDTMFSender FINAL : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public blink::WebRTCDTMFSenderHandlerClient, public ActiveDOMObject { |
- REFCOUNTED_EVENT_TARGET(RTCDTMFSender); |
+class RTCDTMFSender FINAL : public RefCountedWillBeRefCountedGarbageCollected<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public blink::WebRTCDTMFSenderHandlerClient, public ActiveDOMObject { |
+ DECLARE_GC_INFO; |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<RTCDTMFSender>); |
public: |
- static PassRefPtr<RTCDTMFSender> create(ExecutionContext*, blink::WebRTCPeerConnectionHandler*, PassRefPtr<MediaStreamTrack>, ExceptionState&); |
+ static PassRefPtrWillBeRawPtr<RTCDTMFSender> create(ExecutionContext*, blink::WebRTCPeerConnectionHandler*, PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&); |
virtual ~RTCDTMFSender(); |
bool canInsertDTMF() const; |
@@ -68,8 +69,10 @@ public: |
// ActiveDOMObject |
virtual void stop() OVERRIDE; |
+ void trace(Visitor*); |
+ |
private: |
- RTCDTMFSender(ExecutionContext*, PassRefPtr<MediaStreamTrack>, PassOwnPtr<blink::WebRTCDTMFSenderHandler>); |
+ RTCDTMFSender(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaStreamTrack>, PassOwnPtr<blink::WebRTCDTMFSenderHandler>); |
void scheduleDispatchEvent(PassRefPtr<Event>); |
void scheduledEventTimerFired(Timer<RTCDTMFSender>*); |
@@ -77,7 +80,7 @@ private: |
// blink::WebRTCDTMFSenderHandlerClient |
virtual void didPlayTone(const blink::WebString&) OVERRIDE; |
- RefPtr<MediaStreamTrack> m_track; |
+ RefPtrWillBeMember<MediaStreamTrack> m_track; |
long m_duration; |
long m_interToneGap; |