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

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: 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 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, PassRefPtr<RTCPeerConnection> requester, PassOwnPtr<RTCStatsCallback> cal lback, PassRefPtr<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, PassRefPtr<R TCPeerConnection> requester, PassOwnPtr<RTCStatsCallback> callback, PassRefPtr<M ediaStreamTrack> 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 {
50 } 53 }
51 54
52 PassRefPtrWillBeRawPtr<RTCStatsResponseBase> RTCStatsRequestImpl::createResponse () 55 PassRefPtrWillBeRawPtr<RTCStatsResponseBase> RTCStatsRequestImpl::createResponse ()
53 { 56 {
54 return RTCStatsResponse::create(); 57 return RTCStatsResponse::create();
55 } 58 }
56 59
57 bool RTCStatsRequestImpl::hasSelector() 60 bool RTCStatsRequestImpl::hasSelector()
58 { 61 {
59 return m_component; 62 return m_component;
60 } 63 }
61 64
62 MediaStreamComponent* RTCStatsRequestImpl::component() 65 MediaStreamComponent* RTCStatsRequestImpl::component()
63 { 66 {
64 return m_component.get(); 67 return m_component.get();
65 } 68 }
66 69
67 void RTCStatsRequestImpl::requestSucceeded(PassRefPtrWillBeRawPtr<RTCStatsRespon seBase> response) 70 void RTCStatsRequestImpl::requestSucceeded(PassRefPtrWillBeRawPtr<RTCStatsRespon seBase> response)
68 { 71 {
69 if (!m_successCallback) 72 if (!m_successCallback)
70 return; 73 return;
71 m_successCallback->handleEvent(static_cast<RTCStatsResponse*>(response.get() )); 74 if (m_requester && m_requester->requestMayFireStatsCallback())
75 m_successCallback->handleEvent(static_cast<RTCStatsResponse*>(response.g et()));
72 clear(); 76 clear();
73 } 77 }
74 78
75 void RTCStatsRequestImpl::stop() 79 void RTCStatsRequestImpl::stop()
76 { 80 {
77 clear(); 81 clear();
78 } 82 }
79 83
80 void RTCStatsRequestImpl::clear() 84 void RTCStatsRequestImpl::clear()
81 { 85 {
82 m_successCallback.clear(); 86 m_successCallback.clear();
87 m_requester.clear();
83 } 88 }
84 89
85 } // namespace WebCore 90 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698