Enable webrtc pref by default, split getUserMedia into mediadevices pref

servo · Manishearth · May 14, 2019 · May 15, 2019 · May 13, 2019 · May 13, 2019
commit b6acfaca0712c8a1c39f578e8ae29d729c3905a9
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
@@ -190,6 +190,10 @@ mod gen {
                 gamepad: {
                     enabled: bool,
                 },
+                mediadevices: {
+                    #[serde(default)]
+                    enabled: bool,
+                },
                 microdata: {
                     testing: {
                         enabled: bool,

diff --git a/components/script/dom/webidls/MediaDevices.webidl b/components/script/dom/webidls/MediaDevices.webidl
@@ -5,15 +5,15 @@
 // https://w3c.github.io/mediacapture-main/#dom-mediadevices
 
 [Exposed=Window,
-SecureContext, Pref="dom.webrtc.enabled"]
+SecureContext, Pref="dom.mediadevices.enabled"]
 interface MediaDevices : EventTarget {
     //                attribute EventHandler ondevicechange;
     // Promise<sequence<MediaDeviceInfo>> enumerateDevices();
 };
 
 partial interface Navigator {
     // [SameObject, SecureContext]
-    [Pref="dom.webrtc.enabled"] readonly        attribute MediaDevices mediaDevices;
+    [Pref="dom.mediadevices.enabled"] readonly        attribute MediaDevices mediaDevices;
 };
 
 partial interface MediaDevices {

diff --git a/components/script/dom/webidls/MediaStream.webidl b/components/script/dom/webidls/MediaStream.webidl
@@ -7,8 +7,7 @@
 [Exposed=Window,
  Constructor,
  Constructor(MediaStream stream),
- Constructor(sequence<MediaStreamTrack> tracks),
-Pref="dom.webrtc.enabled"]
+ Constructor(sequence<MediaStreamTrack> tracks)]
 interface MediaStream : EventTarget {
     // readonly        attribute DOMString id;
     sequence<MediaStreamTrack> getAudioTracks();

diff --git a/components/script/dom/webidls/MediaStreamTrack.webidl b/components/script/dom/webidls/MediaStreamTrack.webidl
@@ -4,7 +4,7 @@
 
 // https://w3c.github.io/mediacapture-main/#dom-mediastreamtrack
 
-[Exposed=Window, Pref="dom.webrtc.enabled"]
+[Exposed=Window]
 interface MediaStreamTrack : EventTarget {
     readonly        attribute DOMString kind;
     readonly        attribute DOMString id;

diff --git a/resources/prefs.json b/resources/prefs.json
@@ -9,6 +9,7 @@
   "dom.forcetouch.enabled": false,
   "dom.fullscreen.test": false,
   "dom.gamepad.enabled": false,
+  "dom.mediadevices.enabled": false,
   "dom.microdata.enabled": false,
   "dom.microdata.testing.enabled": false,
   "dom.mouseevent.which.enabled": false,
@@ -26,7 +27,7 @@
   "dom.testing.htmlinputelement.select_files.enabled": false,
   "dom.webgl.dom_to_texture.enabled": false,
   "dom.webgl2.enabled": false,
-  "dom.webrtc.enabled": false,
+  "dom.webrtc.enabled": true,
   "dom.webvr.enabled": false,
   "dom.webvr.event_polling_interval": 500,
   "dom.webvr.test": false,

diff --git a/tests/wpt/metadata/webrtc/RTCPeerConnection-onnegotiationneeded.html.ini b/tests/wpt/metadata/webrtc/RTCPeerConnection-onnegotiationneeded.html.ini
@@ -33,3 +33,6 @@
   [calling createDataChannel twice should fire negotiationneeded event once]
     expected: FAIL
 
+  [negotiationneeded event should not fire if signaling state is not stable]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webrtc/__dir__.ini b/tests/wpt/metadata/webrtc/__dir__.ini
@@ -1 +1 @@
-prefs: ["dom.webrtc.enabled:true"]
+prefs: ["dom.webrtc.enabled:true", "dom.mediadevices.enabled:true"]
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -20306,7 +20306,7 @@
    "testharness"
   ],
   "mozilla/interfaces.html": [
-   "2effd46f565c4787e8632f5e898e1b43d457672f",
+   "c3941a5f90824f1081904a42b0d189bad73a8b73",
    "testharness"
   ],
   "mozilla/interfaces.js": [

diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -165,6 +165,8 @@
   "MediaList",
   "MediaQueryList",
   "MediaQueryListEvent",
+  "MediaStream",
+  "MediaStreamTrack",
   "MessageEvent",
   "MimeType",
   "MimeTypeArray",
@@ -201,6 +203,11 @@
   "Range",
   "Request",
   "Response",
+  "RTCIceCandidate",
+  "RTCPeerConnection",
+  "RTCPeerConnectionIceEvent",
+  "RTCSessionDescription",
+  "RTCTrackEvent",
   "Screen",
   "ShadowRoot",
   "StereoPannerNode",