Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1976)

Unified Diff: Source/modules/mediastream/RTCVoidRequestImpl.cpp

Issue 329093002: Allow PeerConnection to be garbage collected after close(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/mediastream/RTCVoidRequestImpl.cpp
diff --git a/Source/modules/mediastream/RTCVoidRequestImpl.cpp b/Source/modules/mediastream/RTCVoidRequestImpl.cpp
index f8422d76e3740a6b608caeef9e56a31afb1c61b7..13ec1f5821e3b2226c2f89774ce34e1b849eb48b 100644
--- a/Source/modules/mediastream/RTCVoidRequestImpl.cpp
+++ b/Source/modules/mediastream/RTCVoidRequestImpl.cpp
@@ -38,18 +38,20 @@
namespace WebCore {
-PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ExecutionContext* context, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCallback> errorCallback)
+PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ExecutionContext* context, PassRefPtr<RTCPeerConnection> requester, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCallback> errorCallback)
{
- RefPtr<RTCVoidRequestImpl> request = adoptRef(new RTCVoidRequestImpl(context, successCallback, errorCallback));
+ RefPtr<RTCVoidRequestImpl> request = adoptRef(new RTCVoidRequestImpl(context, requester, successCallback, errorCallback));
request->suspendIfNeeded();
return request.release();
}
-RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCallback> errorCallback)
+RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, PassRefPtr<RTCPeerConnection> requester, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCallback> errorCallback)
: ActiveDOMObject(context)
, m_successCallback(successCallback)
, m_errorCallback(errorCallback)
+ , m_requester(requester)
{
+ ASSERT(m_requester);
}
RTCVoidRequestImpl::~RTCVoidRequestImpl()
@@ -58,7 +60,8 @@ RTCVoidRequestImpl::~RTCVoidRequestImpl()
void RTCVoidRequestImpl::requestSucceeded()
{
- if (m_successCallback)
+ bool mayFireCallback = m_requester ? m_requester->requestMayFireNonStatsCallback() : true;
+ if (mayFireCallback && m_successCallback)
m_successCallback->handleEvent();
clear();
@@ -66,7 +69,8 @@ void RTCVoidRequestImpl::requestSucceeded()
void RTCVoidRequestImpl::requestFailed(const String& error)
{
- if (m_errorCallback.get())
+ bool mayFireCallback = m_requester ? m_requester->requestMayFireNonStatsCallback() : true;
+ if (mayFireCallback && m_errorCallback.get())
m_errorCallback->handleEvent(error);
clear();
@@ -81,6 +85,7 @@ void RTCVoidRequestImpl::clear()
{
m_successCallback.clear();
m_errorCallback.clear();
+ m_requester.clear();
}
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698