Index: Source/modules/mediastream/RTCDTMFSender.h |
diff --git a/Source/modules/mediastream/RTCDTMFSender.h b/Source/modules/mediastream/RTCDTMFSender.h |
index 69e8620f8c381c21abb86902a2867f65adfc32b3..c4f2055808392865395fc704c83b98a333b18545 100644 |
--- a/Source/modules/mediastream/RTCDTMFSender.h |
+++ b/Source/modules/mediastream/RTCDTMFSender.h |
@@ -43,10 +43,10 @@ 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 { |
+ 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 +68,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(PassRefPtrWillBeRawPtr<Event>); |
void scheduledEventTimerFired(Timer<RTCDTMFSender>*); |
@@ -77,7 +79,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; |
@@ -86,7 +88,7 @@ private: |
bool m_stopped; |
Timer<RTCDTMFSender> m_scheduledEventTimer; |
- WillBePersistentHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; |
+ WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; |
}; |
} // namespace WebCore |