languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 16:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing 'webkit' prefix, as most modern web browsers will accept 'RTCPeerConnection'

Browse source 
Fixes #38325

Change-Id: I08589781c8e8647c1e6d403baf4d6106d5308181
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/116941
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Commit-Queue: Mark Zhou <markzipan@google.com>
Auto-Submit: Mark Zhou <markzipan@google.com>
This commit is contained in:
Mark Zhou 2019-09-24 00:04:00 +00:00 committed by commit-bot@chromium.org
parent 3edcf8f959
commit d012dfc7a6
6 changed files with 13 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sdk/lib/html/dart2js/html_dart2js.dart
View file

@ -25457,15 +25457,7 @@ class RtcDtmfToneChangeEvent extends Event {
@Native("RTCIceCandidate,mozRTCIceCandidate")
class RtcIceCandidate extends Interceptor {
factory RtcIceCandidate(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS(
'',
'window[#]',
Device.isFirefox
? '${Device.propertyPrefix}RTCIceCandidate'
: 'RTCIceCandidate');
var constructorName = JS('', 'window[#]', 'RTCIceCandidate');
return JS('RtcIceCandidate', 'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));
}
@ -25511,8 +25503,8 @@ class RtcLegacyStatsReport extends Interceptor {
@Native("RTCPeerConnection,webkitRTCPeerConnection,mozRTCPeerConnection")
class RtcPeerConnection extends EventTarget {
factory RtcPeerConnection(Map rtcIceServers, [Map mediaConstraints]) {
var constructorName = JS('RtcPeerConnection', 'window[#]',
'${Device.propertyPrefix}RTCPeerConnection');
var constructorName =
JS('RtcPeerConnection', 'window[#]', 'RTCPeerConnection');
if (mediaConstraints != null) {
return JS(
'RtcPeerConnection',
@ -25847,15 +25839,7 @@ class RtcRtpSender extends Interceptor {
@Native("RTCSessionDescription,mozRTCSessionDescription")
class RtcSessionDescription extends Interceptor {
factory RtcSessionDescription(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS(
'',
'window[#]',
Device.isFirefox
? '${Device.propertyPrefix}RTCSessionDescription'
: 'RTCSessionDescription');
var constructorName = JS('', 'window[#]', 'RTCSessionDescription');
return JS('RtcSessionDescription', 'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));
}

24
sdk_nnbd/lib/html/dart2js/html_dart2js.dart
View file

@ -25459,15 +25459,7 @@ class RtcDtmfToneChangeEvent extends Event {
@Native("RTCIceCandidate,mozRTCIceCandidate")
class RtcIceCandidate extends Interceptor {
factory RtcIceCandidate(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS(
'',
'window[#]',
Device.isFirefox
? '${Device.propertyPrefix}RTCIceCandidate'
: 'RTCIceCandidate');
var constructorName = JS('', 'window[#]', 'RTCIceCandidate');
return JS('RtcIceCandidate', 'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));
}
@ -25513,8 +25505,8 @@ class RtcLegacyStatsReport extends Interceptor {
@Native("RTCPeerConnection,webkitRTCPeerConnection,mozRTCPeerConnection")
class RtcPeerConnection extends EventTarget {
factory RtcPeerConnection(Map rtcIceServers, [Map mediaConstraints]) {
var constructorName = JS('RtcPeerConnection', 'window[#]',
'${Device.propertyPrefix}RTCPeerConnection');
var constructorName =
JS('RtcPeerConnection', 'window[#]', 'RTCPeerConnection');
if (mediaConstraints != null) {
return JS(
'RtcPeerConnection',
@ -25849,15 +25841,7 @@ class RtcRtpSender extends Interceptor {
@Native("RTCSessionDescription,mozRTCSessionDescription")
class RtcSessionDescription extends Interceptor {
factory RtcSessionDescription(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS(
'',
'window[#]',
Device.isFirefox
? '${Device.propertyPrefix}RTCSessionDescription'
: 'RTCSessionDescription');
var constructorName = JS('', 'window[#]', 'RTCSessionDescription');
return JS('RtcSessionDescription', 'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));
}

5
tests/lib_2/html/rtc_test.dart
View file

@ -27,10 +27,7 @@ main() {
]
});
expect(pc is RtcPeerConnection, isTrue);
// TODO(efortuna): Uncomment this test when RTCPeerConnection correctly
// implements EventListener in Firefox (works correctly in nightly, so
// it's coming!).
//pc.onIceCandidate.listen((candidate) {});
pc.onIceCandidate.listen((candidate) {});
});
test('ice candidate', () {

7
tools/dom/templates/html/dart2js/impl_RTCIceCandidate.darttemplate
View file

@ -6,12 +6,7 @@ part of $LIBRARYNAME;
$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
factory $CLASSNAME(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS('', 'window[#]',
Device.isFirefox ? '${Device.propertyPrefix}RTCIceCandidate' :
'RTCIceCandidate');
var constructorName = JS('', 'window[#]', 'RTCIceCandidate');
return JS('RtcIceCandidate', 'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));
}

7
tools/dom/templates/html/dart2js/impl_RTCSessionDescription.darttemplate
View file

@ -6,12 +6,7 @@ part of $LIBRARYNAME;
$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
factory $CLASSNAME(Map dictionary) {
// TODO(efortuna): Remove this check if when you can actually construct with
// the unprefixed RTCIceCandidate in Firefox (currently both are defined,
// but one can't be used as a constructor).
var constructorName = JS('', 'window[#]',
Device.isFirefox ? '${Device.propertyPrefix}RTCSessionDescription' :
'RTCSessionDescription');
var constructorName = JS('', 'window[#]', 'RTCSessionDescription');
return JS('RtcSessionDescription',
'new #(#)', constructorName,
convertDartToNative_SerializedScriptValue(dictionary));

4
tools/dom/templates/html/impl/impl_RTCPeerConnection.darttemplate
View file

@ -6,8 +6,8 @@ part of $LIBRARYNAME;
$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
factory $CLASSNAME(Map rtcIceServers, [Map mediaConstraints]) {
var constructorName = JS('RtcPeerConnection', 'window[#]',
'${Device.propertyPrefix}RTCPeerConnection');
var constructorName =
JS('RtcPeerConnection', 'window[#]', 'RTCPeerConnection');
if (mediaConstraints != null) {
return JS('RtcPeerConnection', 'new #(#,#)', constructorName,
convertDartToNative_SerializedScriptValue(rtcIceServers),