Chromium Code Reviews| 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 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1382 void RTCPeerConnection::changeSignalingState(SignalingState signalingState) { | 1382 void RTCPeerConnection::changeSignalingState(SignalingState signalingState) { |
| 1383 if (m_signalingState != SignalingStateClosed && | 1383 if (m_signalingState != SignalingStateClosed && |
| 1384 m_signalingState != signalingState) { | 1384 m_signalingState != signalingState) { |
| 1385 m_signalingState = signalingState; | 1385 m_signalingState = signalingState; |
| 1386 scheduleDispatchEvent(Event::create(EventTypeNames::signalingstatechange)); | 1386 scheduleDispatchEvent(Event::create(EventTypeNames::signalingstatechange)); |
| 1387 } | 1387 } |
| 1388 } | 1388 } |
| 1389 | 1389 |
| 1390 void RTCPeerConnection::changeIceGatheringState( | 1390 void RTCPeerConnection::changeIceGatheringState( |
| 1391 ICEGatheringState iceGatheringState) { | 1391 ICEGatheringState iceGatheringState) { |
| 1392 m_iceGatheringState = iceGatheringState; | 1392 if (m_iceConnectionState != ICEConnectionStateClosed && |
|
hbos_chromium
2017/02/08 12:21:24
To me it's not clear what the ICE agent[1] should
fippo
2017/02/08 12:46:03
SGTM -- change the state but not emit an event.
fippo
2017/02/08 12:50:35
https://w3c.github.io/webrtc-pc/#operation actuall
hbos_chromium
2017/02/08 13:52:54
Setting [[isClosed]] to false is the last step of
| |
| 1393 m_iceGatheringState != iceGatheringState) { | |
| 1394 m_iceGatheringState = iceGatheringState; | |
| 1395 scheduleDispatchEvent(Event::create(EventTypeNames::icegatheringstatechange) ); | |
|
hta - Chromium
2017/02/08 13:35:21
Remember to run "git cl format" in your client and
| |
| 1396 } | |
| 1393 } | 1397 } |
| 1394 | 1398 |
| 1395 bool RTCPeerConnection::setIceConnectionState( | 1399 bool RTCPeerConnection::setIceConnectionState( |
| 1396 ICEConnectionState iceConnectionState) { | 1400 ICEConnectionState iceConnectionState) { |
| 1397 if (m_iceConnectionState != ICEConnectionStateClosed && | 1401 if (m_iceConnectionState != ICEConnectionStateClosed && |
| 1398 m_iceConnectionState != iceConnectionState) { | 1402 m_iceConnectionState != iceConnectionState) { |
| 1399 m_iceConnectionState = iceConnectionState; | 1403 m_iceConnectionState = iceConnectionState; |
| 1400 if (m_iceConnectionState == ICEConnectionStateConnected) | 1404 if (m_iceConnectionState == ICEConnectionStateConnected) |
| 1401 recordRapporMetrics(); | 1405 recordRapporMetrics(); |
| 1402 | 1406 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1486 DEFINE_TRACE(RTCPeerConnection) { | 1490 DEFINE_TRACE(RTCPeerConnection) { |
| 1487 visitor->trace(m_localStreams); | 1491 visitor->trace(m_localStreams); |
| 1488 visitor->trace(m_remoteStreams); | 1492 visitor->trace(m_remoteStreams); |
| 1489 visitor->trace(m_dispatchScheduledEventRunner); | 1493 visitor->trace(m_dispatchScheduledEventRunner); |
| 1490 visitor->trace(m_scheduledEvents); | 1494 visitor->trace(m_scheduledEvents); |
| 1491 EventTargetWithInlineData::trace(visitor); | 1495 EventTargetWithInlineData::trace(visitor); |
| 1492 SuspendableObject::trace(visitor); | 1496 SuspendableObject::trace(visitor); |
| 1493 } | 1497 } |
| 1494 | 1498 |
| 1495 } // namespace blink | 1499 } // namespace blink |
| OLD | NEW |