Title: [134413] branches/chromium/1312/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
- Revision
- 134413
- Author
- [email protected]
- Date
- 2012-11-13 07:15:03 -0800 (Tue, 13 Nov 2012)
Log Message
Merge 134093 - MediaStream API: Don't trigger any object deletion during RTCPeerConnection::stop
https://bugs.webkit.org/show_bug.cgi?id=101586
Reviewed by Adam Barth.
Stop calling stop on the RTCPeerConnectionHandler, and don't delete it, when
ActiveDOMObject::stop is called on RTCPeerConnection. Due to the async nature of the new
API some WebCore objects might be cleaned away which is not allowed at this stage.
This behaviour is not possible to test unfortunately in webkit.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::stop):
[email protected]
Review URL: https://codereview.chromium.org/11363215
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (134412 => 134413)
--- branches/chromium/1312/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-11-13 15:11:40 UTC (rev 134412)
+++ branches/chromium/1312/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-11-13 15:15:03 UTC (rev 134413)
@@ -523,11 +523,6 @@
void RTCPeerConnection::stop()
{
- if (m_readyState != ReadyStateClosed)
- m_peerHandler->stop();
-
- m_peerHandler.clear();
-
m_iceState = IceStateClosed;
m_readyState = ReadyStateClosed;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
