<!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>[188165] branches/safari-601.1.46-branch/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/188165">188165</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 14:37:40 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188150">r188150</a>. rdar://problem/22123707</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderDocumentLoaderh">branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloadercacheCachedRawResourcecpp">branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloadercacheCachedRawResourceClienth">branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResourceClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188164 => 188165)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-07 21:30:35 UTC (rev 188164)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-07 21:37:40 UTC (rev 188165)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-08-07 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r188150.
+
+ 2015-08-07 Andy Estes <aestes@apple.com>
+
+ Crash when following a Google search link to Twitter with Limit Adult Content enabled
+ https://bugs.webkit.org/show_bug.cgi?id=147651
+
+ Reviewed by Brady Eidson.
+
+ When a loaded CachedRawResource gets a new client, it synthesizes the callbacks that the new client would have
+ received while the resource was loading. Unlike a real network load, it synthesizes these callbacks in a single
+ run loop iteration. When DocumentLoader receives a redirect, and finds substitute data in the app cache for the
+ redirect URL, it schedules a timer that removes DocumentLoader as a client of the CachedRawResource then
+ synthesizes its own set of CachedRawResourceClient callbacks. But since CachedRawResource has already delivered
+ client callbacks before the app cache timer fires, DocumentLoader unexpectedly ends up getting two sets of
+ client callbacks and badness ensues.
+
+ The fix is to let CachedRawResource detect if a redirect will trigger the client to load substitute data. If so,
+ stop delivering client callbacks.
+
+ Layout test to follow.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::syntheticRedirectReceived): If there is valid substitute data, do not continue.
+ * loader/DocumentLoader.h:
+ * loader/cache/CachedRawResource.cpp: Returned early if syntheticRedirectReceived() said not to continue.
+ (WebCore::CachedRawResource::didAddClient):
+ * loader/cache/CachedRawResourceClient.h:
+ (WebCore::CachedRawResourceClient::syntheticRedirectReceived):
+
</ins><span class="cx"> 2015-08-06 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188062.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (188164 => 188165)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-07 21:30:35 UTC (rev 188164)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-07 21:37:40 UTC (rev 188165)
</span><span class="lines">@@ -489,6 +489,14 @@
</span><span class="cx"> willSendRequest(request, redirectResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DocumentLoader::syntheticRedirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse, bool& shouldContinue)
+{
+ redirectReceived(resource, request, redirectResponse);
+
+ // If we will soon remove our reference to the CachedRawResource in favor of a SubstituteData load, we don't want to continue receiving synthetic CachedRawResource callbacks.
+ shouldContinue = !m_substituteData.isValid();
+}
+
</ins><span class="cx"> void DocumentLoader::willSendRequest(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
</span><span class="cx"> {
</span><span class="cx"> // Note that there are no asserts here as there are for the other callbacks. This is due to the
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h (188164 => 188165)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h 2015-08-07 21:30:35 UTC (rev 188164)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h 2015-08-07 21:37:40 UTC (rev 188165)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx"> void finishedLoading(double finishTime);
</span><span class="cx"> void mainReceivedError(const ResourceError&);
</span><span class="cx"> WEBCORE_EXPORT virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override;
</span><ins>+ WEBCORE_EXPORT virtual void syntheticRedirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&, bool& /* shouldContinue */) override;
</ins><span class="cx"> WEBCORE_EXPORT virtual void responseReceived(CachedResource*, const ResourceResponse&) override;
</span><span class="cx"> WEBCORE_EXPORT virtual void dataReceived(CachedResource*, const char* data, int length) override;
</span><span class="cx"> WEBCORE_EXPORT virtual void notifyFinished(CachedResource*) override;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.cpp (188164 => 188165)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.cpp 2015-08-07 21:30:35 UTC (rev 188164)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.cpp 2015-08-07 21:37:40 UTC (rev 188165)
</span><span class="lines">@@ -132,8 +132,9 @@
</span><span class="cx"> for (size_t i = 0; i < redirectCount; i++) {
</span><span class="cx"> RedirectPair redirect = m_redirectChain[i];
</span><span class="cx"> ResourceRequest request(redirect.m_request);
</span><del>- client->redirectReceived(this, request, redirect.m_redirectResponse);
- if (!hasClient(c))
</del><ins>+ bool shouldContinue = true;
+ client->syntheticRedirectReceived(this, request, redirect.m_redirectResponse, shouldContinue);
+ if (!hasClient(c) || !shouldContinue)
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(redirectCount == m_redirectChain.size());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloadercacheCachedRawResourceClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResourceClient.h (188164 => 188165)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResourceClient.h 2015-08-07 21:30:35 UTC (rev 188164)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResourceClient.h 2015-08-07 21:37:40 UTC (rev 188165)
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx"> virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
</span><span class="cx"> virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
</span><span class="cx"> virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
</span><ins>+
+ // In response to a redirect, some clients wish to receive no futher callbacks, but cannot immediately remove themselves as a client.
+ // Those clients can express their desire to recieve no futher callbacks by setting shouldContinue to false.
+ virtual void syntheticRedirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& response, bool& /* shouldContinue */) { redirectReceived(resource, request, response); }
</ins><span class="cx"> #if USE(SOUP)
</span><span class="cx"> virtual char* getOrCreateReadBuffer(CachedResource*, size_t /* requestedSize */, size_t& /* actualSize */) { return 0; }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>