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

Side by Side Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

Issue 2494553002: Rename RTCIceCandidateEvent to RTCPeerConnectionIceEvent and expose. (Closed)
Patch Set: Codereview update Created 4 years, 1 month 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
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 * 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "core/loader/FrameLoader.h" 53 #include "core/loader/FrameLoader.h"
54 #include "core/loader/FrameLoaderClient.h" 54 #include "core/loader/FrameLoaderClient.h"
55 #include "modules/crypto/CryptoResultImpl.h" 55 #include "modules/crypto/CryptoResultImpl.h"
56 #include "modules/mediastream/MediaConstraintsImpl.h" 56 #include "modules/mediastream/MediaConstraintsImpl.h"
57 #include "modules/mediastream/MediaStreamEvent.h" 57 #include "modules/mediastream/MediaStreamEvent.h"
58 #include "modules/peerconnection/RTCAnswerOptions.h" 58 #include "modules/peerconnection/RTCAnswerOptions.h"
59 #include "modules/peerconnection/RTCConfiguration.h" 59 #include "modules/peerconnection/RTCConfiguration.h"
60 #include "modules/peerconnection/RTCDTMFSender.h" 60 #include "modules/peerconnection/RTCDTMFSender.h"
61 #include "modules/peerconnection/RTCDataChannel.h" 61 #include "modules/peerconnection/RTCDataChannel.h"
62 #include "modules/peerconnection/RTCDataChannelEvent.h" 62 #include "modules/peerconnection/RTCDataChannelEvent.h"
63 #include "modules/peerconnection/RTCIceCandidateEvent.h"
64 #include "modules/peerconnection/RTCIceServer.h" 63 #include "modules/peerconnection/RTCIceServer.h"
65 #include "modules/peerconnection/RTCOfferOptions.h" 64 #include "modules/peerconnection/RTCOfferOptions.h"
66 #include "modules/peerconnection/RTCPeerConnectionErrorCallback.h" 65 #include "modules/peerconnection/RTCPeerConnectionErrorCallback.h"
66 #include "modules/peerconnection/RTCPeerConnectionIceEvent.h"
67 #include "modules/peerconnection/RTCSessionDescription.h" 67 #include "modules/peerconnection/RTCSessionDescription.h"
68 #include "modules/peerconnection/RTCSessionDescriptionCallback.h" 68 #include "modules/peerconnection/RTCSessionDescriptionCallback.h"
69 #include "modules/peerconnection/RTCSessionDescriptionInit.h" 69 #include "modules/peerconnection/RTCSessionDescriptionInit.h"
70 #include "modules/peerconnection/RTCSessionDescriptionRequestImpl.h" 70 #include "modules/peerconnection/RTCSessionDescriptionRequestImpl.h"
71 #include "modules/peerconnection/RTCSessionDescriptionRequestPromiseImpl.h" 71 #include "modules/peerconnection/RTCSessionDescriptionRequestPromiseImpl.h"
72 #include "modules/peerconnection/RTCStatsCallback.h" 72 #include "modules/peerconnection/RTCStatsCallback.h"
73 #include "modules/peerconnection/RTCStatsReport.h" 73 #include "modules/peerconnection/RTCStatsReport.h"
74 #include "modules/peerconnection/RTCStatsRequestImpl.h" 74 #include "modules/peerconnection/RTCStatsRequestImpl.h"
75 #include "modules/peerconnection/RTCVoidRequestImpl.h" 75 #include "modules/peerconnection/RTCVoidRequestImpl.h"
76 #include "modules/peerconnection/RTCVoidRequestPromiseImpl.h" 76 #include "modules/peerconnection/RTCVoidRequestPromiseImpl.h"
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 void RTCPeerConnection::negotiationNeeded() { 1245 void RTCPeerConnection::negotiationNeeded() {
1246 DCHECK(!m_closed); 1246 DCHECK(!m_closed);
1247 scheduleDispatchEvent(Event::create(EventTypeNames::negotiationneeded)); 1247 scheduleDispatchEvent(Event::create(EventTypeNames::negotiationneeded));
1248 } 1248 }
1249 1249
1250 void RTCPeerConnection::didGenerateICECandidate( 1250 void RTCPeerConnection::didGenerateICECandidate(
1251 const WebRTCICECandidate& webCandidate) { 1251 const WebRTCICECandidate& webCandidate) {
1252 DCHECK(!m_closed); 1252 DCHECK(!m_closed);
1253 DCHECK(getExecutionContext()->isContextThread()); 1253 DCHECK(getExecutionContext()->isContextThread());
1254 if (webCandidate.isNull()) { 1254 if (webCandidate.isNull()) {
1255 scheduleDispatchEvent(RTCIceCandidateEvent::create(false, false, nullptr)); 1255 scheduleDispatchEvent(
1256 RTCPeerConnectionIceEvent::create(false, false, nullptr));
1256 } else { 1257 } else {
1257 RTCIceCandidate* iceCandidate = RTCIceCandidate::create(webCandidate); 1258 RTCIceCandidate* iceCandidate = RTCIceCandidate::create(webCandidate);
1258 scheduleDispatchEvent( 1259 scheduleDispatchEvent(
1259 RTCIceCandidateEvent::create(false, false, iceCandidate)); 1260 RTCPeerConnectionIceEvent::create(false, false, iceCandidate));
1260 } 1261 }
1261 } 1262 }
1262 1263
1263 void RTCPeerConnection::didChangeSignalingState(SignalingState newState) { 1264 void RTCPeerConnection::didChangeSignalingState(SignalingState newState) {
1264 DCHECK(!m_closed); 1265 DCHECK(!m_closed);
1265 DCHECK(getExecutionContext()->isContextThread()); 1266 DCHECK(getExecutionContext()->isContextThread());
1266 changeSignalingState(newState); 1267 changeSignalingState(newState);
1267 } 1268 }
1268 1269
1269 void RTCPeerConnection::didChangeICEGatheringState(ICEGatheringState newState) { 1270 void RTCPeerConnection::didChangeICEGatheringState(ICEGatheringState newState) {
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 DEFINE_TRACE(RTCPeerConnection) { 1473 DEFINE_TRACE(RTCPeerConnection) {
1473 visitor->trace(m_localStreams); 1474 visitor->trace(m_localStreams);
1474 visitor->trace(m_remoteStreams); 1475 visitor->trace(m_remoteStreams);
1475 visitor->trace(m_dispatchScheduledEventRunner); 1476 visitor->trace(m_dispatchScheduledEventRunner);
1476 visitor->trace(m_scheduledEvents); 1477 visitor->trace(m_scheduledEvents);
1477 EventTargetWithInlineData::trace(visitor); 1478 EventTargetWithInlineData::trace(visitor);
1478 ActiveDOMObject::trace(visitor); 1479 ActiveDOMObject::trace(visitor);
1479 } 1480 }
1480 1481
1481 } // namespace blink 1482 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698