Changeset 271486 in webkit

Timestamp:

Jan 14, 2021, 9:17:32 AM (6 years ago)

Author:

youenn@apple.com

Message:

Use callOnMainRunLoop in MediaPermissionUtilities
​https://bugs.webkit.org/show_bug.cgi?id=220616
<rdar://problem/73002655>

Reviewed by Chris Dumez.

This ensures that we are in main thread and not in web thread.

• UIProcess/Cocoa/MediaPermissionUtilities.mm:

(WebKit::requestAVCaptureAccessForType):
(WebKit::requestSpeechRecognitionAccess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/MediaPermissionUtilities.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-14  Youenn Fablet  <youenn@apple.com>
+
+        Use callOnMainRunLoop in MediaPermissionUtilities
+        https://bugs.webkit.org/show_bug.cgi?id=220616
+        <rdar://problem/73002655>
+
+        Reviewed by Chris Dumez.
+
+        This ensures that we are in main thread and not in web thread.
+
+        * UIProcess/Cocoa/MediaPermissionUtilities.mm:
+        (WebKit::requestAVCaptureAccessForType):
+        (WebKit::requestSpeechRecognitionAccess):
+
 2021-01-14  Sihui Liu  <sihui_liu@appe.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/MediaPermissionUtilities.mm

@@ -217 +217 @@
     AVMediaType mediaType = type == MediaPermissionType::Audio ? AVMediaTypeAudio : AVMediaTypeVideo;
     auto decisionHandler = makeBlockPtr([completionHandler = WTFMove(completionHandler)](BOOL authorized) mutable {
-        if (isMainThread()) {
-            completionHandler(authorized);
-            return;
-        }
-
-        callOnMainThread([completionHandler = WTFMove(completionHandler), authorized]() mutable {
+        callOnMainRunLoop([completionHandler = WTFMove(completionHandler), authorized]() mutable {
             completionHandler(authorized);
         });
@@ -250 +245 @@
     auto decisionHandler = makeBlockPtr([completionHandler = WTFMove(completionHandler)](SFSpeechRecognizerAuthorizationStatus status) mutable {
         bool authorized = status == SFSpeechRecognizerAuthorizationStatusAuthorized;
-        if (!isMainThread()) {
-            callOnMainThread([completionHandler = WTFMove(completionHandler), authorized]() mutable {
-                completionHandler(authorized);
-            });
-            return;
-        }
-        completionHandler(authorized);
+        callOnMainRunLoop([completionHandler = WTFMove(completionHandler), authorized]() mutable {
+            completionHandler(authorized);
+        });
     });
     [PAL::getSFSpeechRecognizerClass() requestAuthorization:decisionHandler.get()];