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

Side by Side Diff: Source/modules/mediastream/RTCStatsRequestImpl.cpp

Issue 329093002: Allow PeerConnection to be garbage collected after close(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use ref counting for pending activity for a async operations. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 26
27 #include "modules/mediastream/RTCStatsRequestImpl.h" 27 #include "modules/mediastream/RTCStatsRequestImpl.h"
28 28
29 #include "modules/mediastream/MediaStreamTrack.h" 29 #include "modules/mediastream/MediaStreamTrack.h"
30 #include "modules/mediastream/RTCPeerConnection.h"
30 #include "modules/mediastream/RTCStatsCallback.h" 31 #include "modules/mediastream/RTCStatsCallback.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ExecutionContext* co ntext, PassOwnPtr<RTCStatsCallback> callback, PassRefPtr<MediaStreamTrack> selec tor) 35 PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ExecutionContext* co ntext, RTCPeerConnection* requester, PassOwnPtr<RTCStatsCallback> callback, Pass RefPtr<MediaStreamTrack> selector)
35 { 36 {
36 RefPtr<RTCStatsRequestImpl> request = adoptRef(new RTCStatsRequestImpl(conte xt, callback, selector)); 37 RefPtr<RTCStatsRequestImpl> request = adoptRef(new RTCStatsRequestImpl(conte xt, requester, callback, selector));
37 request->suspendIfNeeded(); 38 request->suspendIfNeeded();
38 return request.release(); 39 return request.release();
39 } 40 }
40 41
41 RTCStatsRequestImpl::RTCStatsRequestImpl(ExecutionContext* context, PassOwnPtr<R TCStatsCallback> callback, PassRefPtr<MediaStreamTrack> selector) 42 RTCStatsRequestImpl::RTCStatsRequestImpl(ExecutionContext* context, RTCPeerConne ction* requester, PassOwnPtr<RTCStatsCallback> callback, PassRefPtr<MediaStreamT rack> selector)
42 : ActiveDOMObject(context) 43 : ActiveDOMObject(context)
43 , m_successCallback(callback) 44 , m_successCallback(callback)
44 , m_component(selector ? selector->component() : 0) 45 , m_component(selector ? selector->component() : 0)
46 , m_requester(requester)
45 { 47 {
48 ASSERT(m_requester);
46 } 49 }
47 50
48 RTCStatsRequestImpl::~RTCStatsRequestImpl() 51 RTCStatsRequestImpl::~RTCStatsRequestImpl()
49 { 52 {
53 if (m_requester)
54 m_requester->requestCompletedCheckIfCallbackShouldFire();
50 } 55 }
51 56
52 PassRefPtrWillBeRawPtr<RTCStatsResponseBase> RTCStatsRequestImpl::createResponse () 57 PassRefPtrWillBeRawPtr<RTCStatsResponseBase> RTCStatsRequestImpl::createResponse ()
53 { 58 {
54 return RTCStatsResponse::create(); 59 return RTCStatsResponse::create();
55 } 60 }
56 61
57 bool RTCStatsRequestImpl::hasSelector() 62 bool RTCStatsRequestImpl::hasSelector()
58 { 63 {
59 return m_component; 64 return m_component;
60 } 65 }
61 66
62 MediaStreamComponent* RTCStatsRequestImpl::component() 67 MediaStreamComponent* RTCStatsRequestImpl::component()
63 { 68 {
64 return m_component.get(); 69 return m_component.get();
65 } 70 }
66 71
67 void RTCStatsRequestImpl::requestSucceeded(PassRefPtrWillBeRawPtr<RTCStatsRespon seBase> response) 72 void RTCStatsRequestImpl::requestSucceeded(PassRefPtrWillBeRawPtr<RTCStatsRespon seBase> response)
68 { 73 {
69 if (!m_successCallback) 74 if (!m_successCallback)
70 return; 75 return;
71 m_successCallback->handleEvent(static_cast<RTCStatsResponse*>(response.get() )); 76 if (m_requester && m_requester->requestCompletedCheckIfCallbackShouldFire())
77 m_successCallback->handleEvent(static_cast<RTCStatsResponse*>(response.g et()));
72 clear(); 78 clear();
73 } 79 }
74 80
75 void RTCStatsRequestImpl::stop() 81 void RTCStatsRequestImpl::stop()
76 { 82 {
83 if (m_requester)
84 m_requester->requestCompletedCheckIfCallbackShouldFire();
77 clear(); 85 clear();
78 } 86 }
79 87
80 void RTCStatsRequestImpl::clear() 88 void RTCStatsRequestImpl::clear()
81 { 89 {
82 m_successCallback.clear(); 90 m_successCallback.clear();
91 m_requester = 0;
83 } 92 }
84 93
85 } // namespace WebCore 94 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698