Attachment 369003 Details for Bug 197566 – Patch for landing

[patch] Patch for landing

bug-197566-20190503152039.patch (text/plain), 3.95 KB, created by youenn fablet on 2019-05-03 15:20:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-05-03 15:20:40 PDT

Size: 3.95 KB

patch

obsolete

>Subversion Revision: 244802
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index e2959600e7183ea0ccc582b622535718f5e47a99..35503a605a48e232d75872cfff82dc901ad825a6 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+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-01  Youenn Fablet  <youenn@apple.com>
> 
>         LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
>diff --git a/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp b/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>index 03a9a14b4e5cd363164a37dcb8604dee03ab7dfa..46e0a6aff59c4058e17d13173e52ce5c39665ea7 100644
>--- a/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>+++ b/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>@@ -537,11 +537,7 @@ bool UserMediaPermissionRequestManagerProxy::wasGrantedVideoOrAudioAccess(uint64
> 
> 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;
> 
>     auto devices = RealtimeMediaSourceCenter::singleton().getMediaStreamDevices();
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fe238c6691a929d3554425a0bbd0f9c6f5d08477..8052416196bc1190de2bbcbbe7700b950cb11f10 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+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-01  Youenn Fablet  <youenn@apple.com>
> 
>         Cache.add and Cache.addAll should compute a correct response body size
>diff --git a/LayoutTests/fast/mediastream/get-user-media-device-id.html b/LayoutTests/fast/mediastream/get-user-media-device-id.html
>index f9621ae5123c48cb3c77a19da82f66138fd39378..9f4d3793ee08f58ff087b75c71ec747179c21bc9 100644
>--- a/LayoutTests/fast/mediastream/get-user-media-device-id.html
>+++ b/LayoutTests/fast/mediastream/get-user-media-device-id.html
>@@ -11,15 +11,14 @@
>     if (window.testRunner)
>         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 })
>             .then((stream) => {

Actions: View | Formatted Diff | Diff

Attachments on bug 197566: 368946 | 369003