OLD | NEW |
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 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "modules/mediastream/RTCVoidRequestImpl.h" | 33 #include "modules/mediastream/RTCVoidRequestImpl.h" |
34 | 34 |
35 #include "core/html/VoidCallback.h" | 35 #include "core/html/VoidCallback.h" |
36 #include "modules/mediastream/RTCErrorCallback.h" | 36 #include "modules/mediastream/RTCErrorCallback.h" |
37 #include "modules/mediastream/RTCPeerConnection.h" | 37 #include "modules/mediastream/RTCPeerConnection.h" |
38 | 38 |
39 namespace WebCore { | 39 namespace WebCore { |
40 | 40 |
41 PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ExecutionContext* cont
ext, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCallback> erro
rCallback) | 41 PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ExecutionContext* cont
ext, RTCPeerConnection* requester, PassOwnPtr<VoidCallback> successCallback, Pas
sOwnPtr<RTCErrorCallback> errorCallback) |
42 { | 42 { |
43 RefPtr<RTCVoidRequestImpl> request = adoptRef(new RTCVoidRequestImpl(context
, successCallback, errorCallback)); | 43 RefPtr<RTCVoidRequestImpl> request = adoptRef(new RTCVoidRequestImpl(context
, requester, successCallback, errorCallback)); |
44 request->suspendIfNeeded(); | 44 request->suspendIfNeeded(); |
45 return request.release(); | 45 return request.release(); |
46 } | 46 } |
47 | 47 |
48 RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, PassOwnPtr<Voi
dCallback> successCallback, PassOwnPtr<RTCErrorCallback> errorCallback) | 48 RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnect
ion* requester, PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<RTCErrorCal
lback> errorCallback) |
49 : ActiveDOMObject(context) | 49 : ActiveDOMObject(context) |
50 , m_successCallback(successCallback) | 50 , m_successCallback(successCallback) |
51 , m_errorCallback(errorCallback) | 51 , m_errorCallback(errorCallback) |
| 52 , m_requester(requester) |
52 { | 53 { |
| 54 ASSERT(m_requester); |
53 } | 55 } |
54 | 56 |
55 RTCVoidRequestImpl::~RTCVoidRequestImpl() | 57 RTCVoidRequestImpl::~RTCVoidRequestImpl() |
56 { | 58 { |
| 59 if (m_requester) |
| 60 m_requester->requestCompletedCheckIfCallbackShouldFire(); |
57 } | 61 } |
58 | 62 |
59 void RTCVoidRequestImpl::requestSucceeded() | 63 void RTCVoidRequestImpl::requestSucceeded() |
60 { | 64 { |
61 if (m_successCallback) | 65 bool shouldFireCallback = m_requester ? m_requester->requestCompletedCheckIf
CallbackShouldFire() : true; |
| 66 if (shouldFireCallback && m_successCallback) |
62 m_successCallback->handleEvent(); | 67 m_successCallback->handleEvent(); |
63 | 68 |
64 clear(); | 69 clear(); |
65 } | 70 } |
66 | 71 |
67 void RTCVoidRequestImpl::requestFailed(const String& error) | 72 void RTCVoidRequestImpl::requestFailed(const String& error) |
68 { | 73 { |
69 if (m_errorCallback.get()) | 74 bool shouldFireCallback = m_requester ? m_requester->requestCompletedCheckIf
CallbackShouldFire() : true; |
| 75 if (shouldFireCallback && m_errorCallback.get()) |
70 m_errorCallback->handleEvent(error); | 76 m_errorCallback->handleEvent(error); |
71 | 77 |
72 clear(); | 78 clear(); |
73 } | 79 } |
74 | 80 |
75 void RTCVoidRequestImpl::stop() | 81 void RTCVoidRequestImpl::stop() |
76 { | 82 { |
| 83 if (m_requester) |
| 84 m_requester->requestCompletedCheckIfCallbackShouldFire(); |
77 clear(); | 85 clear(); |
78 } | 86 } |
79 | 87 |
80 void RTCVoidRequestImpl::clear() | 88 void RTCVoidRequestImpl::clear() |
81 { | 89 { |
82 m_successCallback.clear(); | 90 m_successCallback.clear(); |
83 m_errorCallback.clear(); | 91 m_errorCallback.clear(); |
| 92 m_requester = 0; |
84 } | 93 } |
85 | 94 |
86 } // namespace WebCore | 95 } // namespace WebCore |
OLD | NEW |