Index: Source/modules/mediastream/RTCPeerConnection.cpp |
diff --git a/Source/modules/mediastream/RTCPeerConnection.cpp b/Source/modules/mediastream/RTCPeerConnection.cpp |
index 72bcb3ab32a94b9b9346e417fa261151fa672128..6b30e82edddacadb0aca1393db00584d9ff5db40 100644 |
--- a/Source/modules/mediastream/RTCPeerConnection.cpp |
+++ b/Source/modules/mediastream/RTCPeerConnection.cpp |
@@ -270,7 +270,7 @@ RTCPeerConnection::~RTCPeerConnection() |
ASSERT(m_closed || m_stopped); |
} |
-void RTCPeerConnection::createOffer(PassOwnPtrWillBeRawPtr<RTCSessionDescriptionCallback> successCallback, PassOwnPtrWillBeRawPtr<RTCErrorCallback> errorCallback, const Dictionary& rtcOfferOptions, ExceptionState& exceptionState) |
+void RTCPeerConnection::createOffer(RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback, const Dictionary& rtcOfferOptions, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -294,7 +294,7 @@ void RTCPeerConnection::createOffer(PassOwnPtrWillBeRawPtr<RTCSessionDescription |
} |
} |
-void RTCPeerConnection::createAnswer(PassOwnPtrWillBeRawPtr<RTCSessionDescriptionCallback> successCallback, PassOwnPtrWillBeRawPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
+void RTCPeerConnection::createAnswer(RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -309,7 +309,7 @@ void RTCPeerConnection::createAnswer(PassOwnPtrWillBeRawPtr<RTCSessionDescriptio |
m_peerHandler->createAnswer(request, constraints); |
} |
-void RTCPeerConnection::setLocalDescription(RTCSessionDescription* sessionDescription, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<RTCErrorCallback> errorCallback, ExceptionState& exceptionState) |
+void RTCPeerConnection::setLocalDescription(RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -332,7 +332,7 @@ RTCSessionDescription* RTCPeerConnection::localDescription(ExceptionState& excep |
return RTCSessionDescription::create(webSessionDescription); |
} |
-void RTCPeerConnection::setRemoteDescription(RTCSessionDescription* sessionDescription, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<RTCErrorCallback> errorCallback, ExceptionState& exceptionState) |
+void RTCPeerConnection::setRemoteDescription(RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -388,7 +388,7 @@ void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, Exception |
exceptionState.throwDOMException(SyntaxError, "The ICE candidate could not be added."); |
} |
-void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<RTCErrorCallback> errorCallback, ExceptionState& exceptionState) |
+void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -535,7 +535,7 @@ MediaStream* RTCPeerConnection::getStreamById(const String& streamId) |
return 0; |
} |
-void RTCPeerConnection::getStats(PassOwnPtrWillBeRawPtr<RTCStatsCallback> successCallback, MediaStreamTrack* selector) |
+void RTCPeerConnection::getStats(RTCStatsCallback* successCallback, MediaStreamTrack* selector) |
{ |
RTCStatsRequest* statsRequest = RTCStatsRequestImpl::create(executionContext(), this, successCallback, selector); |
// FIXME: Add passing selector as part of the statsRequest. |