Title: [143285] branches/chromium/1410/Source/WebCore/Modules/mediastream
- Revision
- 143285
- Author
- [email protected]
- Date
- 2013-02-18 18:02:29 -0800 (Mon, 18 Feb 2013)
Log Message
Merge 142887
BUG=176033
Review URL: https://codereview.chromium.org/12297021
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (143284 => 143285)
--- branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2013-02-19 02:01:53 UTC (rev 143284)
+++ branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2013-02-19 02:02:29 UTC (rev 143285)
@@ -243,6 +243,7 @@
void RTCDataChannel::stop()
{
m_stopped = true;
+ m_readyState = ReadyStateClosed;
m_handler->setClient(0);
m_scriptExecutionContext = 0;
}
Modified: branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (143284 => 143285)
--- branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-02-19 02:01:53 UTC (rev 143284)
+++ branches/chromium/1410/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-02-19 02:02:29 UTC (rev 143285)
@@ -162,6 +162,7 @@
RTCPeerConnection::~RTCPeerConnection()
{
+ stop();
}
void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
@@ -590,6 +591,9 @@
void RTCPeerConnection::stop()
{
+ if (m_stopped)
+ return;
+
m_stopped = true;
m_iceConnectionState = IceConnectionStateClosed;
m_signalingState = SignalingStateClosed;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
