Changeset 203174 in webkit

Timestamp:

Jul 13, 2016, 1:01:11 PM (9 years ago)

Author:

Chris Dumez

Message:

WebKit2 shouldn't signal custom protocol clients from the NSURLConnection loader thread.
​https://bugs.webkit.org/show_bug.cgi?id=159725
<rdar://problem/27323131>

Reviewed by Andy Estes.

WebKit2 shouldn't signal custom protocol clients from the NSURLConnection
loader thread. Instead, use the RunLoop the WKCustomProtocol was initialized
on.

• NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:

(-[WKCustomProtocol initWithRequest:cachedResponse:client:]):
(WebKit::dispatchOnInitializationRunLoop):
(WebKit::CustomProtocolManager::didFailWithError):
(WebKit::CustomProtocolManager::didLoadData):
(WebKit::CustomProtocolManager::didReceiveResponse):
(WebKit::CustomProtocolManager::didFinishLoading):
(WebKit::CustomProtocolManager::wasRedirectedToRequest):
(WebKit::dispatchOnResourceLoaderRunLoop): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-13  Chris Dumez  <cdumez@apple.com>
+
+        WebKit2 shouldn't signal custom protocol clients from the NSURLConnection loader thread.
+        https://bugs.webkit.org/show_bug.cgi?id=159725
+        <rdar://problem/27323131>
+
+        Reviewed by Andy Estes.
+
+        WebKit2 shouldn't signal custom protocol clients from the NSURLConnection
+        loader thread. Instead, use the RunLoop the WKCustomProtocol was initialized
+        on.
+
+        * NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
+        (-[WKCustomProtocol initWithRequest:cachedResponse:client:]):
+        (WebKit::dispatchOnInitializationRunLoop):
+        (WebKit::CustomProtocolManager::didFailWithError):
+        (WebKit::CustomProtocolManager::didLoadData):
+        (WebKit::CustomProtocolManager::didReceiveResponse):
+        (WebKit::CustomProtocolManager::didFinishLoading):
+        (WebKit::CustomProtocolManager::wasRedirectedToRequest):
+        (WebKit::dispatchOnResourceLoaderRunLoop): Deleted.
+
 2016-07-13  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm

@@ -58 +58 @@
 @private
     uint64_t _customProtocolID;
+    RetainPtr<CFRunLoopRef> _initializationRunLoop;
 }
 @property (nonatomic, readonly) uint64_t customProtocolID;
+@property (nonatomic, readonly) CFRunLoopRef initializationRunLoop;
 @end
 
@@ -90 +92 @@
     
     _customProtocolID = generateCustomProtocolID();
+    _initializationRunLoop = CFRunLoopGetCurrent();
     if (auto* customProtocolManager = NetworkProcess::singleton().supplement<CustomProtocolManager>())
         customProtocolManager->addCustomProtocol(self);
     return self;
+}
+
+- (CFRunLoopRef)initializationRunLoop
+{
+    return _initializationRunLoop.get();
 }
 
@@ -184 +192 @@
 }
 
-static inline void dispatchOnResourceLoaderRunLoop(void (^block)())
-{
-    CFRunLoopPerformBlock([NSURLConnection resourceLoaderRunLoop], kCFRunLoopDefaultMode, block);
-    CFRunLoopWakeUp([NSURLConnection resourceLoaderRunLoop]);
+static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, void (^block)())
+{
+    CFRunLoopRef runloop = protocol.initializationRunLoop;
+    CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, block);
+    CFRunLoopWakeUp(runloop);
 }
 
@@ -198 +207 @@
     RetainPtr<NSError> nsError = error.nsError();
 
-    dispatchOnResourceLoaderRunLoop(^ {
+    dispatchOnInitializationRunLoop(protocol.get(), ^ {
         [[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
     });
@@ -213 +222 @@
     RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]);
 
-    dispatchOnResourceLoaderRunLoop(^ {
+    dispatchOnInitializationRunLoop(protocol.get(), ^ {
         [[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
     });
@@ -226 +235 @@
     RetainPtr<NSURLResponse> nsResponse = response.nsURLResponse();
 
-    dispatchOnResourceLoaderRunLoop(^ {
+    dispatchOnInitializationRunLoop(protocol.get(), ^ {
         [[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
     });
@@ -237 +246 @@
         return;
 
-    dispatchOnResourceLoaderRunLoop(^ {
+    dispatchOnInitializationRunLoop(protocol.get(), ^ {
         [[protocol client] URLProtocolDidFinishLoading:protocol.get()];
     });
@@ -253 +262 @@
     RetainPtr<NSURLResponse> nsRedirectResponse = redirectResponse.nsURLResponse();
 
-    dispatchOnResourceLoaderRunLoop([protocol, nsRequest, nsRedirectResponse]() {
+    dispatchOnInitializationRunLoop(protocol.get(), [protocol, nsRequest, nsRedirectResponse]() {
         [[protocol client] URLProtocol:protocol.get() wasRedirectedToRequest:nsRequest.get() redirectResponse:nsRedirectResponse.get()];
     });