<!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>[178612] trunk/Source/WebCore</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/178612">178612</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-16 16:12:50 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web pages fail to load using public iOS WebKit; ASSERT(!isMainThread()) in
-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]
https://bugs.webkit.org/show_bug.cgi?id=140470
Patch by Pratik Solanki <psolanki@apple.com> on 2015-01-16
Reviewed by Alexey Proskuryakov.
Fixes an issue where a web page would fail to load in iOS WebKit2 built with the public iOS SDK
because NSURLConnection callbacks were always being scheduled on the main thread.
Currently we always schedule NSURLConnection callbacks to occur on the WebThread or the main
thread depending on whether the WebThread was started. In iOS WebKit2, the callbacks were
always being scheduled on the main thread regardless of whether we were using the NetworkProcess
(since the WebThread is only started when using WebKit1). This led to an assertion failure.
Instead we want to schedule callbacks to an NSOperationsQueue queue when using WebKit2 with the
NetworkProcess (i.e. ResourceHandleClient::usesAsyncCallbacks() is true), on the main thread when
using WebKit2 without the NetworkProcess and on the WebThread when using WebKit1.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::operationQueueForAsyncClients): Remove PLATFORM(IOS)-guards as we want to make use
of this code for iOS WebKit2 with the NetworkProcess.
(WebCore::ResourceHandle::start): Modified to use the existing Mac code path to conditionally
schedule NSURLConnection callbacks to an operation queue when ResourceHandleClient::usesAsyncCallbacks()
is true. Otherwise, schedule the callbacks on the run loop returned by WebThreadNSRunLoop(),
which is either the WebThread or the main thread run loop when using WebKit1 and WebKit2 without
the NetworkProcess, respectively.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178611 => 178612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-17 00:10:59 UTC (rev 178611)
+++ trunk/Source/WebCore/ChangeLog 2015-01-17 00:12:50 UTC (rev 178612)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-16 Pratik Solanki <psolanki@apple.com>
+
+ Web pages fail to load using public iOS WebKit; ASSERT(!isMainThread()) in
+ -[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]
+ https://bugs.webkit.org/show_bug.cgi?id=140470
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fixes an issue where a web page would fail to load in iOS WebKit2 built with the public iOS SDK
+ because NSURLConnection callbacks were always being scheduled on the main thread.
+
+ Currently we always schedule NSURLConnection callbacks to occur on the WebThread or the main
+ thread depending on whether the WebThread was started. In iOS WebKit2, the callbacks were
+ always being scheduled on the main thread regardless of whether we were using the NetworkProcess
+ (since the WebThread is only started when using WebKit1). This led to an assertion failure.
+ Instead we want to schedule callbacks to an NSOperationsQueue queue when using WebKit2 with the
+ NetworkProcess (i.e. ResourceHandleClient::usesAsyncCallbacks() is true), on the main thread when
+ using WebKit2 without the NetworkProcess and on the WebThread when using WebKit1.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::operationQueueForAsyncClients): Remove PLATFORM(IOS)-guards as we want to make use
+ of this code for iOS WebKit2 with the NetworkProcess.
+ (WebCore::ResourceHandle::start): Modified to use the existing Mac code path to conditionally
+ schedule NSURLConnection callbacks to an operation queue when ResourceHandleClient::usesAsyncCallbacks()
+ is true. Otherwise, schedule the callbacks on the run loop returned by WebThreadNSRunLoop(),
+ which is either the WebThread or the main thread run loop when using WebKit1 and WebKit2 without
+ the NetworkProcess, respectively.
+
</ins><span class="cx"> 2015-01-16 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Replay: purge remaining PassRefPtr uses and minor cleanup
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (178611 => 178612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-01-17 00:10:59 UTC (rev 178611)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-01-17 00:12:50 UTC (rev 178612)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> static NSOperationQueue *operationQueueForAsyncClients()
</span><span class="cx"> {
</span><span class="cx"> static NSOperationQueue *queue;
</span><span class="lines">@@ -116,7 +115,6 @@
</span><span class="cx"> }
</span><span class="cx"> return queue;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ResourceHandleInternal::~ResourceHandleInternal()
</span><span class="cx"> {
</span><span class="lines">@@ -259,11 +257,6 @@
</span><span class="cx"> (NSDictionary *)client()->connectionProperties(this).get());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- NSURLConnection *urlConnection = connection();
- [urlConnection scheduleInRunLoop:WebThreadNSRunLoop() forMode:NSDefaultRunLoopMode];
- [urlConnection start];
-#else
</del><span class="cx"> bool scheduled = false;
</span><span class="cx"> if (SchedulePairHashSet* scheduledPairs = d->m_context->scheduledRunLoopPairs()) {
</span><span class="cx"> SchedulePairHashSet::iterator end = scheduledPairs->end();
</span><span class="lines">@@ -280,6 +273,12 @@
</span><span class="cx"> [connection() setDelegateQueue:operationQueueForAsyncClients()];
</span><span class="cx"> scheduled = true;
</span><span class="cx"> }
</span><ins>+#if PLATFORM(IOS)
+ else {
+ [connection() scheduleInRunLoop:WebThreadNSRunLoop() forMode:NSDefaultRunLoopMode];
+ scheduled = true;
+ }
+#endif
</ins><span class="cx">
</span><span class="cx"> // Start the connection if we did schedule with at least one runloop.
</span><span class="cx"> // We can't start the connection until we have one runloop scheduled.
</span><span class="lines">@@ -287,7 +286,6 @@
</span><span class="cx"> [connection() start];
</span><span class="cx"> else
</span><span class="cx"> d->m_startWhenScheduled = true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> LOG(Network, "Handle %p starting connection %p for %@", this, connection(), firstRequest().nsURLRequest(DoNotUpdateHTTPBody));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>