Changeset 271174 in webkit

Timestamp:

Jan 5, 2021, 2:30:31 PM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, reverting r271169.

Caused
TestWebKitAPI.WebKit2.SpeechRecognitionErrorWhenStartingAudioCaptureOnDifferentPage
to time out on macOS.

Reverted changeset:

"Stop speech recognition if page becomes invisible"
​https://bugs.webkit.org/show_bug.cgi?id=220073
​https://trac.webkit.org/changeset/271169

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/SpeechRecognitionServer.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/SpeechRecognitionServer.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-05  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, reverting r271169.
+
+        Caused
+        TestWebKitAPI.WebKit2.SpeechRecognitionErrorWhenStartingAudioCaptureOnDifferentPage
+        to time out on macOS.
+
+        Reverted changeset:
+
+        "Stop speech recognition if page becomes invisible"
+        https://bugs.webkit.org/show_bug.cgi?id=220073
+        https://trac.webkit.org/changeset/271169
+
 2021-01-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp

@@ -162 +162 @@
     ASSERT(m_userPermissionCheck == CheckResult::Granted);
 
-    if (!m_page.isViewVisible()) {
-        completeCurrentRequest(SpeechRecognitionPermissionDecision::Deny);
-        return;
-    }
-
     completeCurrentRequest(SpeechRecognitionPermissionDecision::Grant);
 }

trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp

@@ -169 +169 @@
 }
 
-void SpeechRecognitionServer::abortForPageIsBecomingInvisible()
-{
-    if (!m_recognizer)
-        return;
-
-    auto currentClientIdentifier = m_recognizer->currentClientIdentifier();
-    if (!currentClientIdentifier)
-        return;
-
-    auto error = WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::Aborted, "Page is no longer visible"_s };
-    sendUpdate(*currentClientIdentifier, WebCore::SpeechRecognitionUpdateType::Error, error);
-    m_recognizer->reset();
-}
-
 void SpeechRecognitionServer::sendUpdate(WebCore::SpeechRecognitionConnectionClientIdentifier clientIdentifier, WebCore::SpeechRecognitionUpdateType type, Optional<WebCore::SpeechRecognitionError> error, Optional<Vector<WebCore::SpeechRecognitionResultData>> result)
 {

trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h

@@ -65 +65 @@
     void invalidate(WebCore::SpeechRecognitionConnectionClientIdentifier);
     void mute();
-    void abortForPageIsBecomingInvisible();
 
 private:

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -1996 +1996 @@
         updateCurrentModifierState();
 
-    if ((m_potentiallyChangedActivityStateFlags & ActivityState::IsVisible)) {
-        if (isViewVisible())
-            viewIsBecomingVisible();
-        else
-            m_process->pageIsBecomingInvisible(m_webPageID);
-    }
+    if ((m_potentiallyChangedActivityStateFlags & ActivityState::IsVisible) && isViewVisible())
+        viewIsBecomingVisible();
 
     bool isNowInWindow = (changed & ActivityState::IsInWindow) && isInWindow();

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -1789 +1789 @@
 }
 
-void WebProcessProxy::pageIsBecomingInvisible(WebCore::PageIdentifier identifier)
-{
-    if (auto server = m_speechRecognitionServerMap.get(identifier))
-        server->abortForPageIsBecomingInvisible();
-}
-
 #if PLATFORM(WATCHOS)
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -406 +406 @@
 #endif
     void pageMutedStateChanged(WebCore::PageIdentifier, WebCore::MediaProducer::MutedStateFlags);
-    void pageIsBecomingInvisible(WebCore::PageIdentifier);
 
 protected:

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-05  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, reverting r271169.
+
+        Caused
+        TestWebKitAPI.WebKit2.SpeechRecognitionErrorWhenStartingAudioCaptureOnDifferentPage
+        to time out on macOS.
+
+        Reverted changeset:
+
+        "Stop speech recognition if page becomes invisible"
+        https://bugs.webkit.org/show_bug.cgi?id=220073
+        https://trac.webkit.org/changeset/271169
+
 2021-01-05  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm

@@ -168 +168 @@
 }
 
-// FIXME: enable this test on iOS when https://webkit.org/b/175204 is fixed.
-#if PLATFORM(MAC)
-
-TEST(WebKit2, SpeechRecognitionPageBecomesInvisible)
-{
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    auto handler = adoptNS([[SpeechRecognitionMessageHandler alloc] init]);
-    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
-    auto preferences = [configuration preferences];
-    preferences._mockCaptureDevicesEnabled = YES;
-    preferences._speechRecognitionEnabled = YES;
-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration.get()]);
-    auto delegate = adoptNS([[SpeechRecognitionPermissionUIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    // Page is visible.
-    shouldGrantPermissionRequest = true;
-    receivedScriptMessage = false;
-    [webView synchronouslyLoadTestPageNamed:@"speechrecognition-basic"];
-    [webView stringByEvaluatingJavaScript:@"start()"];
-    TestWebKitAPI::Util::run(&receivedScriptMessage);
-    EXPECT_WK_STREQ(@"Start", [lastScriptMessage body]);
-
-    // Hide page.
-    receivedScriptMessage = false;
-#if PLATFORM(MAC)
-    [webView.get().window setIsVisible:NO];
-#else
-    webView.get().window.hidden = YES;
-#endif
-    TestWebKitAPI::Util::run(&receivedScriptMessage);
-    EXPECT_WK_STREQ(@"Error: aborted - Page is no longer visible", [lastScriptMessage body]);
-
-    // Page is invisible.
-    receivedScriptMessage = false;
-    [webView evaluateJavaScript:@"start()" completionHandler:nil];
-    TestWebKitAPI::Util::run(&receivedScriptMessage);
-    EXPECT_WK_STREQ(@"Error: not-allowed - Permission check failed", [lastScriptMessage body]);
-}
-
-#endif
-
 } // namespace TestWebKitAPI