Changeset 273212 in webkit

Timestamp:

Feb 20, 2021 5:06:59 PM (3 years ago)

Author:

youenn@apple.com

Message:

Add support for adding/removing/clearing mock devices in GPUProcess
​https://bugs.webkit.org/show_bug.cgi?id=222174

Reviewed by Eric Carlson.

Source/WebKit:

Make sure to forward mock device orders to GPU process so that it is kept in sync with UIProcess.
Covered by updated test.

• GPUProcess/GPUProcess.cpp:

(WebKit::GPUProcess::addMockMediaDevice):
(WebKit::GPUProcess::clearMockMediaDevices):
(WebKit::GPUProcess::removeMockMediaDevice):
(WebKit::GPUProcess::resetMockMediaDevices):

• GPUProcess/GPUProcess.h:
• GPUProcess/GPUProcess.messages.in:
• UIProcess/GPU/GPUProcessProxy.cpp:

(WebKit::GPUProcessProxy::addMockMediaDevice):
(WebKit::GPUProcessProxy::clearMockMediaDevices):
(WebKit::GPUProcessProxy::removeMockMediaDevice):
(WebKit::GPUProcessProxy::resetMockMediaDevices):

• UIProcess/GPU/GPUProcessProxy.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::addMockMediaDevice):
(WebKit::WebProcessPool::clearMockMediaDevices):
(WebKit::WebProcessPool::removeMockMediaDevice):
(WebKit::WebProcessPool::resetMockMediaDevices):

LayoutTests:

• fast/mediastream/device-change-event-2.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/device-change-event-2.html (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/GPUProcess/GPUProcess.cpp (modified) (1 diff)
• Source/WebKit/GPUProcess/GPUProcess.h (modified) (2 diffs)
• Source/WebKit/GPUProcess/GPUProcess.messages.in (modified) (1 diff)
• Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/GPU/GPUProcessProxy.h (modified) (2 diffs)
• Source/WebKit/UIProcess/WebProcessPool.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-20  Youenn Fablet  <youenn@apple.com>
+
+        Add support for adding/removing/clearing mock devices in GPUProcess
+        https://bugs.webkit.org/show_bug.cgi?id=222174
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/device-change-event-2.html:
+
 2021-02-20  Sam Weinig  <weinig@apple.com>
 

trunk/LayoutTests/fast/mediastream/device-change-event-2.html

@@ -70 +70 @@
         assert_equals(devices[0].label, "my mic");
 
+        const micStream = await navigator.mediaDevices.getUserMedia({ audio : { deviceId : "id2" } });
+        assert_equals(micStream.getAudioTracks()[0].label, "my mic");
     }, "'devicechange' event fired when device list changes");
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-20  Youenn Fablet  <youenn@apple.com>
+
+        Add support for adding/removing/clearing mock devices in GPUProcess
+        https://bugs.webkit.org/show_bug.cgi?id=222174
+
+        Reviewed by Eric Carlson.
+
+        Make sure to forward mock device orders to GPU process so that it is kept in sync with UIProcess.
+        Covered by updated test.
+
+        * GPUProcess/GPUProcess.cpp:
+        (WebKit::GPUProcess::addMockMediaDevice):
+        (WebKit::GPUProcess::clearMockMediaDevices):
+        (WebKit::GPUProcess::removeMockMediaDevice):
+        (WebKit::GPUProcess::resetMockMediaDevices):
+        * GPUProcess/GPUProcess.h:
+        * GPUProcess/GPUProcess.messages.in:
+        * UIProcess/GPU/GPUProcessProxy.cpp:
+        (WebKit::GPUProcessProxy::addMockMediaDevice):
+        (WebKit::GPUProcessProxy::clearMockMediaDevices):
+        (WebKit::GPUProcessProxy::removeMockMediaDevice):
+        (WebKit::GPUProcessProxy::resetMockMediaDevices):
+        * UIProcess/GPU/GPUProcessProxy.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::addMockMediaDevice):
+        (WebKit::WebProcessPool::clearMockMediaDevices):
+        (WebKit::WebProcessPool::removeMockMediaDevice):
+        (WebKit::WebProcessPool::resetMockMediaDevices):
+
 2021-02-20  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/GPUProcess/GPUProcess.cpp

@@ -229 +229 @@
     completionHandler();
 }
+
+void GPUProcess::addMockMediaDevice(const WebCore::MockMediaDevice& device)
+{
+    MockRealtimeMediaSourceCenter::addDevice(device);
+}
+
+void GPUProcess::clearMockMediaDevices()
+{
+    MockRealtimeMediaSourceCenter::setDevices({ });
+}
+
+void GPUProcess::removeMockMediaDevice(const String& persistentId)
+{
+    MockRealtimeMediaSourceCenter::removeDevice(persistentId);
+}
+
+void GPUProcess::resetMockMediaDevices()
+{
+    MockRealtimeMediaSourceCenter::resetDevices();
+}
 #endif
 

trunk/Source/WebKit/GPUProcess/GPUProcess.h

@@ -38 +38 @@
 namespace WebCore {
 class NowPlayingManager;
+struct MockMediaDevice;
 }
 
@@ -112 +113 @@
     void setOrientationForMediaCapture(uint64_t orientation);
     void updateCaptureAccess(bool allowAudioCapture, bool allowVideoCapture, bool allowDisplayCapture, WebCore::ProcessIdentifier, CompletionHandler<void()>&&);
+    void addMockMediaDevice(const WebCore::MockMediaDevice&);
+    void clearMockMediaDevices();
+    void removeMockMediaDevice(const String& persistentId);
+    void resetMockMediaDevices();
 #endif
 

trunk/Source/WebKit/GPUProcess/GPUProcess.messages.in

@@ -41 +41 @@
     SetOrientationForMediaCapture(uint64_t orientation);
     UpdateCaptureAccess(bool allowAudioCapture, bool allowVideoCapture, bool allowDisplayCapture, WebCore::ProcessIdentifier processID) -> () Async
+    AddMockMediaDevice(struct WebCore::MockMediaDevice device);
+    ClearMockMediaDevices();
+    RemoveMockMediaDevice(String persistentId);
+    ResetMockMediaDevices();
 #endif
 }

trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp

@@ -189 +189 @@
     sendWithAsyncReply(Messages::GPUProcess::UpdateCaptureAccess { allowAudioCapture, allowVideoCapture, allowDisplayCapture, processID }, WTFMove(completionHandler));
 }
+
+
+void GPUProcessProxy::addMockMediaDevice(const WebCore::MockMediaDevice& device)
+{
+    send(Messages::GPUProcess::AddMockMediaDevice { device }, 0);
+}
+
+void GPUProcessProxy::clearMockMediaDevices()
+{
+    send(Messages::GPUProcess::ClearMockMediaDevices { }, 0);
+}
+
+void GPUProcessProxy::removeMockMediaDevice(const String& persistentId)
+{
+    send(Messages::GPUProcess::RemoveMockMediaDevice { persistentId }, 0);
+}
+
+void GPUProcessProxy::resetMockMediaDevices()
+{
+    send(Messages::GPUProcess::ResetMockMediaDevices { }, 0);
+}
 #endif
 

trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.h

@@ -42 +42 @@
 #endif
 
+namespace WebCore {
+struct MockMediaDevice;
+}
+
 namespace WebKit {
 
@@ -66 +70 @@
     void setOrientationForMediaCapture(uint64_t orientation);
     void updateCaptureAccess(bool allowAudioCapture, bool allowVideoCapture, bool allowDisplayCapture, WebCore::ProcessIdentifier, CompletionHandler<void()>&&);
+
+    void addMockMediaDevice(const WebCore::MockMediaDevice&);
+    void clearMockMediaDevices();
+    void removeMockMediaDevice(const String&);
+    void resetMockMediaDevices();
 #endif
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1905 +1905 @@
     MockRealtimeMediaSourceCenter::addDevice(device);
     sendToAllProcesses(Messages::WebProcess::AddMockMediaDevice { device });
+#if ENABLE(GPU_PROCESS)
+    ensureGPUProcess().addMockMediaDevice(device);
+#endif
 #endif
 }
@@ -1913 +1916 @@
     MockRealtimeMediaSourceCenter::setDevices({ });
     sendToAllProcesses(Messages::WebProcess::ClearMockMediaDevices { });
+#if ENABLE(GPU_PROCESS)
+    ensureGPUProcess().clearMockMediaDevices();
+#endif
 #endif
 }
@@ -1921 +1927 @@
     MockRealtimeMediaSourceCenter::removeDevice(persistentId);
     sendToAllProcesses(Messages::WebProcess::RemoveMockMediaDevice { persistentId });
+#if ENABLE(GPU_PROCESS)
+    ensureGPUProcess().removeMockMediaDevice(persistentId);
+#endif
 #endif
 }
@@ -1929 +1938 @@
     MockRealtimeMediaSourceCenter::resetDevices();
     sendToAllProcesses(Messages::WebProcess::ResetMockMediaDevices { });
+#if ENABLE(GPU_PROCESS)
+    ensureGPUProcess().resetMockMediaDevices();
+#endif
 #endif
 }