Changeset 271238 in webkit

Timestamp:

Jan 7, 2021, 9:13:03 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERTION FAILED: !m_messageReceiverMapCount under WebKit::SpeechRecognitionServer::~SpeechRecognitionServer()
​https://bugs.webkit.org/show_bug.cgi?id=220404

Patch by Sihui Liu <​sihui_liu@appe.com> on 2021-01-07
Reviewed by Youenn Fablet.

Source/WebKit:

API test: WebKit2.SpeechRecognitionPageIsDestroyed

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::destroySpeechRecognitionServer):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm:

(-[SpeechRecognitionPermissionUIDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
(-[SpeechRecognitionNavigationDelegate webView:decidePolicyForNavigationAction:preferences:decisionHandler:]):
(-[SpeechRecognitionNavigationDelegate webView:didFinishNavigation:]):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-07  Sihui Liu  <sihui_liu@appe.com>
+
+        ASSERTION FAILED: !m_messageReceiverMapCount under WebKit::SpeechRecognitionServer::~SpeechRecognitionServer()
+        https://bugs.webkit.org/show_bug.cgi?id=220404
+
+        Reviewed by Youenn Fablet.
+
+        API test: WebKit2.SpeechRecognitionPageIsDestroyed
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::destroySpeechRecognitionServer):
+
 2021-01-07  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -1749 +1749 @@
 void WebProcessProxy::destroySpeechRecognitionServer(SpeechRecognitionServerIdentifier identifier)
 {
-    if (m_speechRecognitionServerMap.remove(identifier))
+    if (auto server = m_speechRecognitionServerMap.take(identifier))
         removeMessageReceiver(Messages::SpeechRecognitionServer::messageReceiverName(), identifier);
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-07  Sihui Liu  <sihui_liu@appe.com>
+
+        ASSERTION FAILED: !m_messageReceiverMapCount under WebKit::SpeechRecognitionServer::~SpeechRecognitionServer()
+        https://bugs.webkit.org/show_bug.cgi?id=220404
+
+        Reviewed by Youenn Fablet.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm:
+        (-[SpeechRecognitionPermissionUIDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
+        (-[SpeechRecognitionNavigationDelegate webView:decidePolicyForNavigationAction:preferences:decisionHandler:]):
+        (-[SpeechRecognitionNavigationDelegate webView:didFinishNavigation:]):
+        (TestWebKitAPI::TEST):
+
 2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -29 +29 @@
 #import "TestWKWebView.h"
 #import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/WKUIDelegatePrivate.h>
 #import <WebKit/WKWebView.h>
@@ -37 +38 @@
 static bool permissionRequested = false;
 static bool receivedScriptMessage;
+static bool didFinishNavigation;
 static RetainPtr<WKScriptMessage> lastScriptMessage;
+static RetainPtr<WKWebView> createdWebView;
 
 @interface SpeechRecognitionPermissionUIDelegate : NSObject<WKUIDelegatePrivate>
@@ -43 +46 @@
 - (void)_webView:(WKWebView *)webView requestMediaCaptureAuthorization: (_WKCaptureDevices)devices decisionHandler:(void (^)(BOOL))decisionHandler;
 - (void)_webView:(WKWebView *)webView checkUserMediaPermissionForURL:(NSURL *)url mainFrameURL:(NSURL *)mainFrameURL frameIdentifier:(NSUInteger)frameIdentifier decisionHandler:(void (^)(NSString *salt, BOOL authorized))decisionHandler;
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures;
 @end
 
@@ -61 +65 @@
     decisionHandler(@"0x9876543210", YES);
 }
+
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
+{
+    createdWebView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration]);
+    return createdWebView.get();
+}
 @end
 
@@ -71 +81 @@
     receivedScriptMessage = true;
     lastScriptMessage = message;
+}
+@end
+
+@interface SpeechRecognitionNavigationDelegate : NSObject <WKNavigationDelegate>
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction preferences:(WKWebpagePreferences *)preferences decisionHandler:(void (^)(WKNavigationActionPolicy, WKWebpagePreferences *))decisionHandler;
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation;
+@end
+
+@implementation SpeechRecognitionNavigationDelegate
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction preferences:(WKWebpagePreferences *)preferences decisionHandler:(void (^)(WKNavigationActionPolicy, WKWebpagePreferences *))decisionHandler
+{
+    decisionHandler(WKNavigationActionPolicyAllow, preferences);
+}
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+    didFinishNavigation = true;
 }
 @end
@@ -208 +235 @@
 }
 
+TEST(WebKit2, SpeechRecognitionPageIsDestroyed)
+{
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    auto preferences = [configuration preferences];
+    preferences._mockCaptureDevicesEnabled = YES;
+    preferences._speechRecognitionEnabled = YES;
+    preferences.javaScriptCanOpenWindowsAutomatically = YES;
+    auto delegate = adoptNS([[SpeechRecognitionPermissionUIDelegate alloc] init]);
+    auto navigationDelegate = adoptNS([[SpeechRecognitionNavigationDelegate alloc] init]);
+    shouldGrantPermissionRequest = true;
+    createdWebView = nullptr;
+
+    @autoreleasepool {
+        auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+        [webView setUIDelegate:delegate.get()];
+        [webView setNavigationDelegate:navigationDelegate.get()];
+
+        didFinishNavigation = false;
+        [webView loadHTMLString:@"<script>speechRecognition = new webkitSpeechRecognition(); speechRecognition.start(); speechRecognition = null;</script>" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
+        TestWebKitAPI::Util::run(&didFinishNavigation);
+        [configuration.get().processPool _garbageCollectJavaScriptObjectsForTesting];
+
+        bool finishedRunningScript = false;
+        [webView evaluateJavaScript:@"open('http://webkit.org')" completionHandler: [&] (id result, NSError *error) {
+            finishedRunningScript = true;
+        }];
+        TestWebKitAPI::Util::run(&finishedRunningScript);
+    }
+
+    TestWebKitAPI::Util::sleep(0.5);
+
+    EXPECT_TRUE(!!createdWebView);
+}
+
 #endif