Chromium Code Reviews| Index: Source/modules/mediastream/RTCPeerConnection.h |
| diff --git a/Source/modules/mediastream/RTCPeerConnection.h b/Source/modules/mediastream/RTCPeerConnection.h |
| index da1fcc17f2b9c5327ff6e73af5f5c0079afa6566..d397f197bbe8aa6cd2973be7f1b45366d5e35e61 100644 |
| --- a/Source/modules/mediastream/RTCPeerConnection.h |
| +++ b/Source/modules/mediastream/RTCPeerConnection.h |
| @@ -56,21 +56,22 @@ class RTCSessionDescriptionCallback; |
| class RTCStatsCallback; |
| class VoidCallback; |
| -class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public blink::WebRTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject { |
| - REFCOUNTED_EVENT_TARGET(RTCPeerConnection); |
| +class RTCPeerConnection FINAL : public RefCountedWillBeRefCountedGarbageCollected<RTCPeerConnection>, public ScriptWrappable, public blink::WebRTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject { |
| + DECLARE_GC_INFO; |
| + DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<RTCPeerConnection>); |
| public: |
| - static PassRefPtr<RTCPeerConnection> create(ExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&); |
| + static PassRefPtrWillBeRawPtr<RTCPeerConnection> create(ExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&); |
| virtual ~RTCPeerConnection(); |
| void createOffer(PassOwnPtr<RTCSessionDescriptionCallback>, PassOwnPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionState&); |
| void createAnswer(PassOwnPtr<RTCSessionDescriptionCallback>, PassOwnPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionState&); |
| - void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassOwnPtr<VoidCallback>, PassOwnPtr<RTCErrorCallback>, ExceptionState&); |
| - PassRefPtr<RTCSessionDescription> localDescription(ExceptionState&); |
| + void setLocalDescription(PassRefPtrWillBeRawPtr<RTCSessionDescription>, PassOwnPtr<VoidCallback>, PassOwnPtr<RTCErrorCallback>, ExceptionState&); |
| + PassRefPtrWillBeRawPtr<RTCSessionDescription> localDescription(ExceptionState&); |
| - void setRemoteDescription(PassRefPtr<RTCSessionDescription>, PassOwnPtr<VoidCallback>, PassOwnPtr<RTCErrorCallback>, ExceptionState&); |
| - PassRefPtr<RTCSessionDescription> remoteDescription(ExceptionState&); |
| + void setRemoteDescription(PassRefPtrWillBeRawPtr<RTCSessionDescription>, PassOwnPtr<VoidCallback>, PassOwnPtr<RTCErrorCallback>, ExceptionState&); |
| + PassRefPtrWillBeRawPtr<RTCSessionDescription> remoteDescription(ExceptionState&); |
| String signalingState() const; |
| @@ -91,15 +92,15 @@ public: |
| MediaStream* getStreamById(const String& streamId); |
| - void addStream(PassRefPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionState&); |
| + void addStream(PassRefPtrWillBeRawPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionState&); |
| - void removeStream(PassRefPtr<MediaStream>, ExceptionState&); |
| + void removeStream(PassRefPtrWillBeRawPtr<MediaStream>, ExceptionState&); |
| void getStats(PassOwnPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector); |
| - PassRefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionState&); |
| + PassRefPtrWillBeRawPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionState&); |
| - PassRefPtr<RTCDTMFSender> createDTMFSender(PassRefPtr<MediaStreamTrack>, ExceptionState&); |
| + PassRefPtrWillBeRawPtr<RTCDTMFSender> createDTMFSender(PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&); |
| void close(ExceptionState&); |
| @@ -131,6 +132,8 @@ public: |
| virtual void stop() OVERRIDE; |
| virtual bool hasPendingActivity() const OVERRIDE { return !m_stopped; } |
| + void trace(Visitor*); |
| + |
| private: |
| RTCPeerConnection(ExecutionContext*, PassRefPtr<RTCConfiguration>, blink::WebMediaConstraints, ExceptionState&); |
| @@ -150,7 +153,7 @@ private: |
| MediaStreamVector m_localStreams; |
| MediaStreamVector m_remoteStreams; |
|
haraken
2014/02/21 10:47:05
You need to trace these two HeapVectors.
keishi
2014/02/26 06:14:59
Done.
|
| - Vector<RefPtr<RTCDataChannel> > m_dataChannels; |
| + WillBeHeapVector<RefPtrWillBeMember<RTCDataChannel> > m_dataChannels; |
| OwnPtr<blink::WebRTCPeerConnectionHandler> m_peerHandler; |