Changeset 244935 in webkit

Timestamp:

May 3, 2019 4:13:31 PM (5 years ago)

Author:

youenn@apple.com

Message:

[iOS] set the default maximum camera count to 1 for enumerateDevices
​https://bugs.webkit.org/show_bug.cgi?id=197566

Reviewed by Eric Carlson.

Source/WebKit:

The previous number for iOS was 2 as there is a front and a back camera.
Since we are by default setting deviceIds to "", it is better to just have one,
as it might confuse applications to have two devices with the same ID.

Covered by updated test.

• UIProcess/UserMediaPermissionRequestManagerProxy.cpp:

(WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList):

LayoutTests:

• fast/mediastream/get-user-media-device-id.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/get-user-media-device-id.html (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-03  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] set the default maximum camera count to 1 for enumerateDevices
+        https://bugs.webkit.org/show_bug.cgi?id=197566
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/get-user-media-device-id.html:
+
 2019-05-03  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/fast/mediastream/get-user-media-device-id.html

@@ -12 +12 @@
         testRunner.setUserMediaPermission(true);
 
-    promise_test((test) => {
-        return navigator.mediaDevices.enumerateDevices()
-            .then((devices) => {
-                devices.forEach((device) => {
-                    assert_true(device.deviceId.length == 0 , "device.deviceId is empty before permission to capture");
-                });
-            });
+    promise_test(async (test) => {
+        const devices = await navigator.mediaDevices.enumerateDevices();
+        assert_true(devices.length <= 2, "before getting permission, at most 1 camera and 1 microphone are exposed");
+        devices.forEach((device) => {
+            assert_true(device.deviceId.length == 0 , "device.deviceId is empty before permission to capture");
+        });
     }, "Device IDs should be empty initially");
-    
+
     promise_test((test) => {
         return navigator.mediaDevices.getUserMedia({ audio:true, video:true })

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-03  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] set the default maximum camera count to 1 for enumerateDevices
+        https://bugs.webkit.org/show_bug.cgi?id=197566
+
+        Reviewed by Eric Carlson.
+
+        The previous number for iOS was 2 as there is a front and a back camera.
+        Since we are by default setting deviceIds to "", it is better to just have one,
+        as it might confuse applications to have two devices with the same ID.
+
+        Covered by updated test.
+
+        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+        (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList):
+
 2019-05-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

@@ -538 +538 @@
 Vector<CaptureDevice> UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList(bool revealIdsAndLabels, const String& deviceIDHashSalt)
 {
-#if PLATFORM(IOS_FAMILY)
-    static const int defaultMaximumCameraCount = 2;
-#else
     static const int defaultMaximumCameraCount = 1;
-#endif
     static const int defaultMaximumMicrophoneCount = 1;