<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203174] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203174">203174</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-13 13:01:11 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessCustomProtocolsCocoaCustomProtocolManagerCocoamm">trunk/Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203173 => 203174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-13 20:00:26 UTC (rev 203173)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-13 20:01:11 UTC (rev 203174)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-07-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Update supported platforms in xcconfig files to match the sdk names.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessCustomProtocolsCocoaCustomProtocolManagerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (203173 => 203174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2016-07-13 20:00:26 UTC (rev 203173)
+++ trunk/Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2016-07-13 20:01:11 UTC (rev 203174)
</span><span class="lines">@@ -57,8 +57,10 @@
</span><span class="cx"> @interface WKCustomProtocol : NSURLProtocol {
</span><span class="cx"> @private
</span><span class="cx"> uint64_t _customProtocolID;
</span><ins>+ RetainPtr<CFRunLoopRef> _initializationRunLoop;
</ins><span class="cx"> }
</span><span class="cx"> @property (nonatomic, readonly) uint64_t customProtocolID;
</span><ins>+@property (nonatomic, readonly) CFRunLoopRef initializationRunLoop;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKCustomProtocol
</span><span class="lines">@@ -89,11 +91,17 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _customProtocolID = generateCustomProtocolID();
</span><ins>+ _initializationRunLoop = CFRunLoopGetCurrent();
</ins><span class="cx"> if (auto* customProtocolManager = NetworkProcess::singleton().supplement<CustomProtocolManager>())
</span><span class="cx"> customProtocolManager->addCustomProtocol(self);
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CFRunLoopRef)initializationRunLoop
+{
+ return _initializationRunLoop.get();
+}
+
</ins><span class="cx"> - (void)startLoading
</span><span class="cx"> {
</span><span class="cx"> if (auto* customProtocolManager = NetworkProcess::singleton().supplement<CustomProtocolManager>())
</span><span class="lines">@@ -183,10 +191,11 @@
</span><span class="cx"> return m_registeredSchemes.contains(scheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void dispatchOnResourceLoaderRunLoop(void (^block)())
</del><ins>+static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, void (^block)())
</ins><span class="cx"> {
</span><del>- CFRunLoopPerformBlock([NSURLConnection resourceLoaderRunLoop], kCFRunLoopDefaultMode, block);
- CFRunLoopWakeUp([NSURLConnection resourceLoaderRunLoop]);
</del><ins>+ CFRunLoopRef runloop = protocol.initializationRunLoop;
+ CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, block);
+ CFRunLoopWakeUp(runloop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError& error)
</span><span class="lines">@@ -197,7 +206,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSError> nsError = error.nsError();
</span><span class="cx">
</span><del>- dispatchOnResourceLoaderRunLoop(^ {
</del><ins>+ dispatchOnInitializationRunLoop(protocol.get(), ^ {
</ins><span class="cx"> [[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -212,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]);
</span><span class="cx">
</span><del>- dispatchOnResourceLoaderRunLoop(^ {
</del><ins>+ dispatchOnInitializationRunLoop(protocol.get(), ^ {
</ins><span class="cx"> [[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -225,7 +234,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSURLResponse> nsResponse = response.nsURLResponse();
</span><span class="cx">
</span><del>- dispatchOnResourceLoaderRunLoop(^ {
</del><ins>+ dispatchOnInitializationRunLoop(protocol.get(), ^ {
</ins><span class="cx"> [[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -236,7 +245,7 @@
</span><span class="cx"> if (!protocol)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- dispatchOnResourceLoaderRunLoop(^ {
</del><ins>+ dispatchOnInitializationRunLoop(protocol.get(), ^ {
</ins><span class="cx"> [[protocol client] URLProtocolDidFinishLoading:protocol.get()];
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -252,7 +261,7 @@
</span><span class="cx"> RetainPtr<NSURLRequest> nsRequest = request.nsURLRequest(WebCore::DoNotUpdateHTTPBody);
</span><span class="cx"> RetainPtr<NSURLResponse> nsRedirectResponse = redirectResponse.nsURLResponse();
</span><span class="cx">
</span><del>- dispatchOnResourceLoaderRunLoop([protocol, nsRequest, nsRedirectResponse]() {
</del><ins>+ dispatchOnInitializationRunLoop(protocol.get(), [protocol, nsRequest, nsRedirectResponse]() {
</ins><span class="cx"> [[protocol client] URLProtocol:protocol.get() wasRedirectedToRequest:nsRequest.get() redirectResponse:nsRedirectResponse.get()];
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>