Changeset 276514 in webkit

Timestamp:

Apr 23, 2021, 12:53:26 PM (5 years ago)

Author:

BJ Burg

Message:

Web Inspector: [Cocoa] WKInspectorResourceURLSchemeHandler needs to serialize cleanup actions
​https://bugs.webkit.org/show_bug.cgi?id=224986
<rdar://76768454>

Reviewed by Devin Rousso.

• UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:

(-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
Do cleanup on the main queue so that it can be serialized with reads.

(-[WKInspectorResourceURLSchemeHandler webView:stopURLSchemeTask:]):
Ensure that all removals from the map are processed before doing a lookup.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-23  BJ Burg  <bburg@apple.com>
+
+        Web Inspector: [Cocoa] WKInspectorResourceURLSchemeHandler needs to serialize cleanup actions
+        https://bugs.webkit.org/show_bug.cgi?id=224986
+        <rdar://76768454>
+
+        Reviewed by Devin Rousso.
+
+        * UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:
+        (-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
+        Do cleanup on the main queue so that it can be serialized with reads.
+
+        (-[WKInspectorResourceURLSchemeHandler webView:stopURLSchemeTask:]):
+        Ensure that all removals from the map are processed before doing a lookup.
+
 2021-04-23  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm

@@ -89 +89 @@
 
     NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-        [_fileLoadOperations removeObjectForKey:urlSchemeTask];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [_fileLoadOperations removeObjectForKey:urlSchemeTask];
+        });
 
         NSURL *requestURL = urlSchemeTask.request.URL;
@@ -137 +139 @@
 - (void)webView:(WKWebView *)webView stopURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
 {
-    if (NSOperation *operation = [_fileLoadOperations objectForKey:urlSchemeTask]) {
-        [operation cancel];
-        [_fileLoadOperations removeObjectForKey:urlSchemeTask];
-    }
+    // Ensure that all blocks with pending removals are dispatched before doing a map lookup.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (NSOperation *operation = [_fileLoadOperations objectForKey:urlSchemeTask]) {
+            [operation cancel];
+            [_fileLoadOperations removeObjectForKey:urlSchemeTask];
+        }
+    });
 }