Title: [271031] trunk/Source/WebKit
Revision
271031
Author
[email protected]
Date
2020-12-21 11:35:24 -0800 (Mon, 21 Dec 2020)

Log Message

Check availability of speech recognition service before requesting permissions
https://bugs.webkit.org/show_bug.cgi?id=220033

Reviewed by Youenn Fablet.

If speech recognition service is not available for target language (maybe the language is not supported, user
turns off dictation in system settings, etc), let's just fail the speech recognition request without prompting.

Manually tested with MiniBrowser.

* UIProcess/Cocoa/MediaPermissionUtilities.mm:
(WebKit::requestSpeechRecognitionAccess):
(WebKit::checkSpeechRecognitionServiceAccess):
(WebKit::checkSpeechRecognitionServiceAvailability):
* UIProcess/MediaPermissionUtilities.h:
* UIProcess/SpeechRecognitionPermissionManager.cpp:
(WebKit::SpeechRecognitionPermissionManager::request):
(WebKit::SpeechRecognitionPermissionManager::startProcessingRequest):
* UIProcess/SpeechRecognitionPermissionManager.h:
* UIProcess/SpeechRecognitionPermissionRequest.h:
(WebKit::SpeechRecognitionPermissionRequest::create):
(WebKit::SpeechRecognitionPermissionRequest::lang const):
(WebKit::SpeechRecognitionPermissionRequest::SpeechRecognitionPermissionRequest):
* UIProcess/SpeechRecognitionServer.cpp:
(WebKit::SpeechRecognitionServer::requestPermissionForRequest):
* UIProcess/SpeechRecognitionServer.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::requestSpeechRecognitionPermission):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createSpeechRecognitionServer):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (271030 => 271031)


--- trunk/Source/WebKit/ChangeLog	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/ChangeLog	2020-12-21 19:35:24 UTC (rev 271031)
@@ -1,3 +1,37 @@
+2020-12-21  Sihui Liu  <[email protected]>
+
+        Check availability of speech recognition service before requesting permissions
+        https://bugs.webkit.org/show_bug.cgi?id=220033
+
+        Reviewed by Youenn Fablet.
+
+        If speech recognition service is not available for target language (maybe the language is not supported, user 
+        turns off dictation in system settings, etc), let's just fail the speech recognition request without prompting.
+
+        Manually tested with MiniBrowser.
+
+        * UIProcess/Cocoa/MediaPermissionUtilities.mm:
+        (WebKit::requestSpeechRecognitionAccess):
+        (WebKit::checkSpeechRecognitionServiceAccess):
+        (WebKit::checkSpeechRecognitionServiceAvailability):
+        * UIProcess/MediaPermissionUtilities.h:
+        * UIProcess/SpeechRecognitionPermissionManager.cpp:
+        (WebKit::SpeechRecognitionPermissionManager::request):
+        (WebKit::SpeechRecognitionPermissionManager::startProcessingRequest):
+        * UIProcess/SpeechRecognitionPermissionManager.h:
+        * UIProcess/SpeechRecognitionPermissionRequest.h:
+        (WebKit::SpeechRecognitionPermissionRequest::create):
+        (WebKit::SpeechRecognitionPermissionRequest::lang const):
+        (WebKit::SpeechRecognitionPermissionRequest::SpeechRecognitionPermissionRequest):
+        * UIProcess/SpeechRecognitionServer.cpp:
+        (WebKit::SpeechRecognitionServer::requestPermissionForRequest):
+        * UIProcess/SpeechRecognitionServer.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::requestSpeechRecognitionPermission):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::createSpeechRecognitionServer):
+
 2020-12-21  Alicia Boya GarcĂ­a  <[email protected]>
 
         [MSE] Fix allSamplesInTrackEnqueued() handling

Modified: trunk/Source/WebKit/UIProcess/Cocoa/MediaPermissionUtilities.mm (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/Cocoa/MediaPermissionUtilities.mm	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/Cocoa/MediaPermissionUtilities.mm	2020-12-21 19:35:24 UTC (rev 271031)
@@ -38,14 +38,8 @@
 #import <wtf/URLHelpers.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 
-#if HAVE(SPEECHRECOGNIZER)
-#import <Speech/Speech.h>
-
-SOFT_LINK_FRAMEWORK(Speech)
-SOFT_LINK_CLASS(Speech, SFSpeechRecognizer)
-#endif
-
 #import <pal/cocoa/AVFoundationSoftLink.h>
+#import <pal/cocoa/SpeechSoftLink.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(TCC)
 SOFT_LINK(TCC, TCCAccessPreflight, TCCAccessPreflightResult, (CFStringRef service, CFDictionaryRef options), (service, options))
@@ -254,12 +248,12 @@
         }
         completionHandler(authorized);
     });
-    [getSFSpeechRecognizerClass() requestAuthorization:decisionHandler.get()];
+    [PAL::getSFSpeechRecognizerClass() requestAuthorization:decisionHandler.get()];
 }
 
 MediaPermissionResult checkSpeechRecognitionServiceAccess()
 {
-    auto authorizationStatus = [getSFSpeechRecognizerClass() authorizationStatus];
+    auto authorizationStatus = [PAL::getSFSpeechRecognizerClass() authorizationStatus];
     if (authorizationStatus == SFSpeechRecognizerAuthorizationStatusDenied || authorizationStatus == SFSpeechRecognizerAuthorizationStatusRestricted)
         return MediaPermissionResult::Denied;
     if (authorizationStatus == SFSpeechRecognizerAuthorizationStatusAuthorized)
@@ -267,6 +261,12 @@
     return MediaPermissionResult::Unknown;
 }
 
+bool checkSpeechRecognitionServiceAvailability(const String& localeIdentifier)
+{
+    auto recognizer = localeIdentifier.isEmpty() ? adoptNS([PAL::allocSFSpeechRecognizerInstance() init]) : adoptNS([PAL::allocSFSpeechRecognizerInstance() initWithLocale:[NSLocale localeWithLocaleIdentifier:localeIdentifier]]);
+    return recognizer && [recognizer isAvailable];
+}
+
 #endif // HAVE(SPEECHRECOGNIZER)
 
 } // namespace WebKit

Modified: trunk/Source/WebKit/UIProcess/MediaPermissionUtilities.h (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/MediaPermissionUtilities.h	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/MediaPermissionUtilities.h	2020-12-21 19:35:24 UTC (rev 271031)
@@ -68,6 +68,7 @@
 #if HAVE(SPEECHRECOGNIZER)
 void requestSpeechRecognitionAccess(CompletionHandler<void(bool authorized)>&&);
 MediaPermissionResult checkSpeechRecognitionServiceAccess();
+bool checkSpeechRecognitionServiceAvailability(const String& localeIdentifier);
 #endif
 
 } // namespace WebKit

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp	2020-12-21 19:35:24 UTC (rev 271031)
@@ -75,9 +75,9 @@
         request->complete(SpeechRecognitionPermissionDecision::Deny);
 }
     
-void SpeechRecognitionPermissionManager::request(const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completiontHandler)
+void SpeechRecognitionPermissionManager::request(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completiontHandler)
 {
-    m_requests.append(SpeechRecognitionPermissionRequest::create(origin, WTFMove(completiontHandler)));
+    m_requests.append(SpeechRecognitionPermissionRequest::create(lang, origin, WTFMove(completiontHandler)));
     if (m_requests.size() == 1)
         startNextRequest();
 }
@@ -104,11 +104,26 @@
     m_speechRecognitionServiceCheck = computeSpeechRecognitionServiceAccess();
 
     m_page.syncIfMockDevicesEnabledChanged();
-    if (m_page.preferences().mockCaptureDevicesEnabled()) {
+    bool mockCaptureDevicesEnabled = m_page.preferences().mockCaptureDevicesEnabled();
+    if (mockCaptureDevicesEnabled) {
         m_microphoneCheck = CheckResult::Granted;
         m_speechRecognitionServiceCheck = CheckResult::Granted;
     }
 
+#if HAVE(SPEECHRECOGNIZER)
+    if (!mockCaptureDevicesEnabled && m_speechRecognitionServiceCheck != CheckResult::Denied) {
+        // Speech recognition service can be unavailable when user does not enable dictation in system settings.
+        // Let's avoid prompting user in that case.
+        if (!checkSpeechRecognitionServiceAvailability(m_requests.first()->lang()))
+            m_speechRecognitionServiceCheck = CheckResult::Denied;
+    }
+#endif
+
+    if (m_microphoneCheck == CheckResult::Denied || m_speechRecognitionServiceCheck == CheckResult::Denied) {
+        completeCurrentRequest(SpeechRecognitionPermissionDecision::Deny);
+        return;
+    }
+
     // We currently don't allow third-party access.
     if (m_userPermissionCheck == CheckResult::Unknown) {
         auto clientOrigin = m_requests.first()->origin();
@@ -118,7 +133,7 @@
             m_userPermissionCheck = CheckResult::Denied;
     }
 
-    if (m_microphoneCheck == CheckResult::Denied || m_speechRecognitionServiceCheck == CheckResult::Denied || m_userPermissionCheck == CheckResult::Denied) {
+    if (m_userPermissionCheck == CheckResult::Denied) {
         completeCurrentRequest(SpeechRecognitionPermissionDecision::Deny);
         return;
     }

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.h (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.h	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.h	2020-12-21 19:35:24 UTC (rev 271031)
@@ -39,7 +39,7 @@
     enum class CheckResult { Denied, Granted, Unknown };
     explicit SpeechRecognitionPermissionManager(WebPageProxy&);
     ~SpeechRecognitionPermissionManager();
-    void request(const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&);
+    void request(const String& lang, const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&);
 
     void decideByDefaultAction(const WebCore::SecurityOrigin&, CompletionHandler<void(bool)>&&);
 

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionRequest.h (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionRequest.h	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionRequest.h	2020-12-21 19:35:24 UTC (rev 271031)
@@ -35,9 +35,9 @@
 
 class SpeechRecognitionPermissionRequest : public RefCounted<SpeechRecognitionPermissionRequest> {
 public:
-    static Ref<SpeechRecognitionPermissionRequest> create(const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
+    static Ref<SpeechRecognitionPermissionRequest> create(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
     {
-        return adoptRef(*new SpeechRecognitionPermissionRequest(origin, WTFMove(completionHandler)));
+        return adoptRef(*new SpeechRecognitionPermissionRequest(lang, origin, WTFMove(completionHandler)));
     }
 
     void complete(SpeechRecognitionPermissionDecision decision)
@@ -47,13 +47,16 @@
     }
 
     const WebCore::ClientOrigin& origin() const { return m_origin; }
+    const String& lang() const { return m_lang; }
 
 private:
-    SpeechRecognitionPermissionRequest(const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
-        : m_origin(origin)
+    SpeechRecognitionPermissionRequest(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
+        : m_lang(lang)
+        , m_origin(origin)
         , m_completionHandler(WTFMove(completionHandler))
     { }
 
+    String m_lang;
     WebCore::ClientOrigin m_origin;
     CompletionHandler<void(SpeechRecognitionPermissionDecision)> m_completionHandler;
 };

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp	2020-12-21 19:35:24 UTC (rev 271031)
@@ -36,7 +36,6 @@
 
 namespace WebKit {
 
-
 SpeechRecognitionServer::SpeechRecognitionServer(Ref<IPC::Connection>&& connection, SpeechRecognitionServerIdentifier identifier, SpeechRecognitionPermissionChecker&& permissionChecker, SpeechRecognitionCheckIfMockSpeechRecognitionEnabled&& checkIfEnabled
 #if ENABLE(MEDIA_STREAM)
     , RealtimeMediaSourceCreateFunction&& function
@@ -64,7 +63,7 @@
 
 void SpeechRecognitionServer::requestPermissionForRequest(WebCore::SpeechRecognitionRequest& request)
 {
-    m_permissionChecker(request.clientOrigin(), [this, weakThis = makeWeakPtr(this), weakRequest = makeWeakPtr(request)](SpeechRecognitionPermissionDecision decision) mutable {
+    m_permissionChecker(request.lang(), request.clientOrigin(), [this, weakThis = makeWeakPtr(this), weakRequest = makeWeakPtr(request)](auto decision) mutable {
         if (!weakThis)
             return;
 

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h	2020-12-21 19:35:24 UTC (rev 271031)
@@ -46,7 +46,7 @@
 enum class SpeechRecognitionPermissionDecision : bool;
 
 using SpeechRecognitionServerIdentifier = WebCore::PageIdentifier;
-using SpeechRecognitionPermissionChecker = Function<void(const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&)>;
+using SpeechRecognitionPermissionChecker = Function<void(const String&, const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&)>;
 using SpeechRecognitionCheckIfMockSpeechRecognitionEnabled = Function<bool()>;
 
 class SpeechRecognitionServer : public CanMakeWeakPtr<SpeechRecognitionServer>, public IPC::MessageReceiver, private IPC::MessageSender {

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2020-12-21 19:35:24 UTC (rev 271031)
@@ -10343,12 +10343,12 @@
     });
 }
 
-void WebPageProxy::requestSpeechRecognitionPermission(const WebCore::ClientOrigin& clientOrigin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
+void WebPageProxy::requestSpeechRecognitionPermission(const String& lang, const WebCore::ClientOrigin& clientOrigin, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&& completionHandler)
 {
     if (!m_speechRecognitionPermissionManager)
         m_speechRecognitionPermissionManager = makeUnique<SpeechRecognitionPermissionManager>(*this);
 
-    m_speechRecognitionPermissionManager->request(clientOrigin, WTFMove(completionHandler));
+    m_speechRecognitionPermissionManager->request(lang, clientOrigin, WTFMove(completionHandler));
 }
 
 void WebPageProxy::requestSpeechRecognitionPermissionByDefaultAction(const WebCore::SecurityOrigin& origin, CompletionHandler<void(bool)>&& completionHandler)

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.h	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h	2020-12-21 19:35:24 UTC (rev 271031)
@@ -1829,7 +1829,7 @@
     void setMediaCaptureReportingDelay(Seconds captureReportingDelay) { m_mediaCaptureReportingDelay = captureReportingDelay; }
     size_t suspendMediaPlaybackCounter() { return m_suspendMediaPlaybackCounter; }
 
-    void requestSpeechRecognitionPermission(const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&);
+    void requestSpeechRecognitionPermission(const String& lang, const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&);
     void requestSpeechRecognitionPermissionByDefaultAction(const WebCore::SecurityOrigin&, CompletionHandler<void(bool)>&&);
 
     void syncIfMockDevicesEnabledChanged();

Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (271030 => 271031)


--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-12-21 19:24:18 UTC (rev 271030)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-12-21 19:35:24 UTC (rev 271031)
@@ -1722,13 +1722,13 @@
 
     ASSERT(!m_speechRecognitionServerMap.contains(identifier));
     auto& speechRecognitionServer = m_speechRecognitionServerMap.add(identifier, nullptr).iterator->value;
-    auto permissionChecker = [weakPage = makeWeakPtr(targetPage)](auto& origin, auto&& completionHandler) mutable {
+    auto permissionChecker = [weakPage = makeWeakPtr(targetPage)](auto& lang, auto& origin, auto&& completionHandler) mutable {
         if (!weakPage) {
             completionHandler(SpeechRecognitionPermissionDecision::Deny);
             return;
         }
 
-        weakPage->requestSpeechRecognitionPermission(origin, WTFMove(completionHandler));
+        weakPage->requestSpeechRecognitionPermission(lang, origin, WTFMove(completionHandler));
     };
     auto checkIfMockCaptureDevicesEnabled = [weakPage = makeWeakPtr(targetPage)]() {
         return weakPage && weakPage->preferences().mockCaptureDevicesEnabled();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to