Changeset 258837 in webkit

Timestamp:

Mar 23, 2020 7:24:19 AM (4 years ago)

Author:

youenn@apple.com

Message:

MediaDevices::refreshDevices should take device type into account
​https://bugs.webkit.org/show_bug.cgi?id=209417
<rdar://problem/60521332>

Reviewed by Eric Carlson.

Source/WebCore:

Now that we set deviceId to the empty string when media capture is not granted,
we can have two devices with the same ID. We also need to handle the device type.

• Modules/mediastream/MediaDevices.cpp:

(WebCore::MediaDevices::refreshDevices):

LayoutTests:

• fast/mediastream/media-device-info-expected.txt:
• fast/mediastream/media-device-info.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/media-device-info-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/media-device-info.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaDevices.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-23  youenn fablet  <youenn@apple.com>
+
+        MediaDevices::refreshDevices should take device type into account
+        https://bugs.webkit.org/show_bug.cgi?id=209417
+        <rdar://problem/60521332>
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/media-device-info-expected.txt:
+        * fast/mediastream/media-device-info.html:
+
 2020-03-22  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/fast/mediastream/media-device-info-expected.txt

@@ -1 +1 @@
 
 PASS Test properties of MediaDeviceInfo 
+PASS Ensure enumerateDevices exposes both microphone and camera 
 

trunk/LayoutTests/fast/mediastream/media-device-info.html

@@ -7 +7 @@
     <script src="../../resources/testharnessreport.js"></script>
     <script>
-    var devices = [];
-
-    if (window.testRunner)
-        testRunner.setUserMediaPermission(true);
-
     promise_test((test) => {
         return navigator.mediaDevices.enumerateDevices()
@@ -34 +29 @@
     }, "Test properties of MediaDeviceInfo");
 
+    promise_test(async (test) => {
+        await navigator.mediaDevices.enumerateDevices();
+        const devices = await navigator.mediaDevices.enumerateDevices();
+        assert_equals(devices.length, 2);
+        assert_equals(devices[0].kind, "audioinput");
+        assert_equals(devices[1].kind, "videoinput");
+    }, "Ensure enumerateDevices exposes both microphone and camera");
     </script>
 </head>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-23  youenn fablet  <youenn@apple.com>
+
+        MediaDevices::refreshDevices should take device type into account
+        https://bugs.webkit.org/show_bug.cgi?id=209417
+        <rdar://problem/60521332>
+
+        Reviewed by Eric Carlson.
+
+        Now that we set deviceId to the empty string when media capture is not granted,
+        we can have two devices with the same ID. We also need to handle the device type.
+
+        * Modules/mediastream/MediaDevices.cpp:
+        (WebCore::MediaDevices::refreshDevices):
+
 2020-03-23  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp

@@ -182 +182 @@
             continue;
 
-        auto index = m_devices.findMatching([&newDevice](auto& oldDevice) {
-            return oldDevice->deviceId() == newDevice.persistentId();
+        auto deviceKind = newDevice.type() == CaptureDevice::DeviceType::Microphone ? MediaDeviceInfo::Kind::Audioinput : MediaDeviceInfo::Kind::Videoinput;
+        auto index = m_devices.findMatching([deviceKind, &newDevice](auto& oldDevice) {
+            return oldDevice->deviceId() == newDevice.persistentId() && oldDevice->kind() == deviceKind;
         });
         if (index != notFound) {
@@ -190 +191 @@
         }
 
-        auto deviceType = newDevice.type() == CaptureDevice::DeviceType::Microphone ? MediaDeviceInfo::Kind::Audioinput : MediaDeviceInfo::Kind::Videoinput;
-        devices.append(MediaDeviceInfo::create(newDevice.label(), newDevice.persistentId(), newDevice.groupId(), deviceType));
+        devices.append(MediaDeviceInfo::create(newDevice.label(), newDevice.persistentId(), newDevice.groupId(), deviceKind));
     }
     m_devices = WTFMove(devices);