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

Unified Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

Issue 2413703002: Sync RTCDataChannel and RTCPeerConnection IDL with spec (Closed)
Patch Set: rebase Created 4 years, 2 months 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
index c43de77b699ba9b1255242a3cfcb6f535979335f..304db02e50bd7c07129bbbf9370a2512742f44c5 100644
--- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
+++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
@@ -821,8 +821,7 @@ RTCSessionDescription* RTCPeerConnection::remoteDescription() {
return RTCSessionDescription::create(webSessionDescription);
}
-void RTCPeerConnection::updateIce(ExecutionContext* context,
- const Dictionary& rtcConfiguration,
+void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration,
const Dictionary& mediaConstraints,
ExceptionState& exceptionState) {
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState))
@@ -1191,6 +1190,7 @@ ScriptPromise RTCPeerConnection::getStats(ScriptState* scriptState,
}
RTCDataChannel* RTCPeerConnection::createDataChannel(
+ ExecutionContext* context,
String label,
const Dictionary& options,
ExceptionState& exceptionState) {
@@ -1204,10 +1204,17 @@ RTCDataChannel* RTCPeerConnection::createDataChannel(
unsigned short value = 0;
if (DictionaryHelper::get(options, "id", value))
init.id = value;
- if (DictionaryHelper::get(options, "maxRetransmits", value))
+ if (DictionaryHelper::get(options, "maxRetransmits", value)) {
+ UseCounter::count(
+ context, UseCounter::RTCPeerConnectionCreateDataChannelMaxRetransmits);
init.maxRetransmits = value;
- if (DictionaryHelper::get(options, "maxRetransmitTime", value))
+ }
+ if (DictionaryHelper::get(options, "maxRetransmitTime", value)) {
+ UseCounter::count(
+ context,
+ UseCounter::RTCPeerConnectionCreateDataChannelMaxRetransmitTime);
init.maxRetransmitTime = value;
+ }
String protocolString;
DictionaryHelper::get(options, "protocol", protocolString);

Powered by Google App Engine
This is Rietveld 408576698