Changeset 272735 in webkit

Timestamp:

Feb 11, 2021 9:30:34 AM (17 months ago)

Author:

youenn@apple.com

Message:

[MacOS] Enable Audio Capture in GPUProcess by default
​https://bugs.webkit.org/show_bug.cgi?id=221400

Reviewed by Eric Carlson.

Source/WebKit:

Covered by existing API tests, in particular TestWebKitAPI.WebKit.OnDeviceChangeCrash.

• WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp:

We need to synchronously fill the granted requests, otherwise there is a risk that
the granted requests will be cleared (on page close for instance) and then later filled
for the page that was gone.

• Shared/WebPreferencesDefaultValues.cpp:

(WebKit::defaultCaptureAudioInGPUProcessEnabled):

Tools:

• TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm:

(-[GetUserMediaRepromptTestView haveStream:]):
Increase timeout since capture might require spinning GPUProcess.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-11  Youenn Fablet  <youenn@apple.com>
+
+        [MacOS] Enable Audio Capture in GPUProcess by default
+        https://bugs.webkit.org/show_bug.cgi?id=221400
+
+        Reviewed by Eric Carlson.
+
+        Covered by existing API tests, in particular TestWebKitAPI.WebKit.OnDeviceChangeCrash.
+
+        * WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+        We need to synchronously fill the granted requests, otherwise there is a risk that
+        the granted requests will be cleared (on page close for instance) and then later filled
+        for the page that was gone.
+        * Shared/WebPreferencesDefaultValues.cpp:
+        (WebKit::defaultCaptureAudioInGPUProcessEnabled):
+
 2021-02-11  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -184 +184 @@
 bool defaultCaptureAudioInGPUProcessEnabled()
 {
-#if HAVE(SYSTEM_FEATURE_FLAGS)
-#if PLATFORM(MAC)
-    return isFeatureFlagEnabled("gpu_process_webrtc");
-#elif PLATFORM(IOS_FAMILY)
+#if PLATFORM(MAC)
+    return true;
+#elif HAVE(SYSTEM_FEATURE_FLAGS)
     return isFeatureFlagEnabled("gpu_process_media");
-#endif
-#endif
-
-    return false;
+#else
+    return false;
+#endif
 }
 

trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

@@ -240 +240 @@
     ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID(), ", video: ", request.videoDevice().label(), ", audio: ", request.audioDevice().label());
 
+    if (request.requestType() == MediaStreamRequest::Type::UserMedia)
+        m_grantedRequests.append(makeRef(request));
+
     if (auto callback = request.decisionCompletionHandler()) {
         m_page.willStartCapture(request, [callback = WTFMove(callback)]() mutable {
             callback(true);
         });
-        m_grantedRequests.append(makeRef(request));
         return;
     }
@@ -272 +274 @@
         if (!weakThis)
             return;
-
-        auto& request = strongRequest.get();
-
-        if (request.requestType() == MediaStreamRequest::Type::UserMedia)
-            m_grantedRequests.append(makeRef(request));
 
         // FIXME: m_hasFilteredDeviceList will trigger ondevicechange events for various documents from different origins.
@@ -293 +290 @@
 #endif
 
+        auto& request = strongRequest.get();
         m_page.sendWithAsyncReply(Messages::WebPage::UserMediaAccessWasGranted { request.userMediaID(), request.audioDevice(), request.videoDevice(), request.deviceIdentifierHashSalt(), handle }, [this, weakThis = WTFMove(weakThis)] {
             if (!weakThis)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-11  Youenn Fablet  <youenn@apple.com>
+
+        [MacOS] Enable Audio Capture in GPUProcess by default
+        https://bugs.webkit.org/show_bug.cgi?id=221400
+
+        Reviewed by Eric Carlson.
+
+        * TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm:
+        (-[GetUserMediaRepromptTestView haveStream:]):
+        Increase timeout since capture might require spinning GPUProcess.
+
 2021-02-11  Lauro Moura  <lmoura@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm

@@ -86 +86 @@
 - (BOOL)haveStream:(BOOL)expected
 {
-    int retryCount = 10;
+    int retryCount = 1000;
     while (retryCount--) {
         auto result = [self stringByEvaluatingJavaScript:@"haveStream()"];