<!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>[169055] branches/safari-538.34.5-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/169055">169055</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 12:54:48 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168909">r168909</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceWebCoreChangeLog">branches/safari-538.34.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreplatformnetworkBlobResourceHandlecpp">branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreplatformnetworkBlobResourceHandleh">branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.h</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreplatformnetworkResourceHandleh">branches/safari-538.34.5-branch/Source/WebCore/platform/network/ResourceHandle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/ChangeLog (169054 => 169055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-19 19:10:46 UTC (rev 169054)
+++ branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-19 19:54:48 UTC (rev 169055)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-19 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168909
+
+ 2014-05-15 Alexey Proskuryakov <ap@apple.com>
+
+ NetworkProcess crashes at ResourceHandle::continueDidReceiveResponse
+ https://bugs.webkit.org/show_bug.cgi?id=132966
+ <rdar://problem/16373694>
+
+ Reviewed by Brady Eidson.
+
+ Covered by many fast/files tests.
+
+ * platform/network/BlobResourceHandle.cpp: (WebCore::BlobResourceHandle::continueDidReceiveResponse):
+ * platform/network/BlobResourceHandle.h:
+ * platform/network/ResourceHandle.h:
+ Don't call delegate's continueDidReceiveResponse when loading a blob:// URL,
+ the delegate is null. On the Mac, we used to lazily create it, which was also wrong,
+ but at least not observable.
+
</ins><span class="cx"> 2014-05-16 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168886
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp (169054 => 169055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-05-19 19:10:46 UTC (rev 169054)
+++ branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-05-19 19:54:48 UTC (rev 169055)
</span><span class="lines">@@ -202,6 +202,11 @@
</span><span class="cx"> ResourceHandle::cancel();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void BlobResourceHandle::continueDidReceiveResponse()
+{
+ // BlobResourceHandle doesn't wait for didReceiveResponse, and it currently cannot be used for downloading.
+}
+
</ins><span class="cx"> void delayedStartBlobResourceHandle(void* context)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BlobResourceHandle> handle = adoptRef(static_cast<BlobResourceHandle*>(context));
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreplatformnetworkBlobResourceHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.h (169054 => 169055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2014-05-19 19:10:46 UTC (rev 169054)
+++ branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2014-05-19 19:54:48 UTC (rev 169055)
</span><span class="lines">@@ -48,20 +48,12 @@
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> struct BlobDataItem;
</span><span class="cx">
</span><del>-class BlobResourceHandle : public FileStreamClient, public ResourceHandle {
</del><ins>+class BlobResourceHandle final : public FileStreamClient, public ResourceHandle {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<BlobResourceHandle> createAsync(BlobData*, const ResourceRequest&, ResourceHandleClient*);
</span><span class="cx">
</span><span class="cx"> static void loadResourceSynchronously(BlobData*, const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data);
</span><span class="cx">
</span><del>- // FileStreamClient methods.
- virtual void didGetSize(long long) override;
- virtual void didOpen(bool) override;
- virtual void didRead(int) override;
-
- // ResourceHandle methods.
- virtual void cancel() override;
-
</del><span class="cx"> void start();
</span><span class="cx"> int readSync(char*, int);
</span><span class="cx">
</span><span class="lines">@@ -73,6 +65,15 @@
</span><span class="cx"> BlobResourceHandle(BlobData*, const ResourceRequest&, ResourceHandleClient*, bool async);
</span><span class="cx"> virtual ~BlobResourceHandle();
</span><span class="cx">
</span><ins>+ // FileStreamClient methods.
+ virtual void didGetSize(long long) override;
+ virtual void didOpen(bool) override;
+ virtual void didRead(int) override;
+
+ // ResourceHandle methods.
+ virtual void cancel() override;
+ virtual void continueDidReceiveResponse() override;
+
</ins><span class="cx"> void doStart();
</span><span class="cx"> void getSizeForNext();
</span><span class="cx"> void seek();
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/platform/network/ResourceHandle.h (169054 => 169055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/platform/network/ResourceHandle.h 2014-05-19 19:10:46 UTC (rev 169054)
+++ branches/safari-538.34.5-branch/Source/WebCore/platform/network/ResourceHandle.h 2014-05-19 19:54:48 UTC (rev 169055)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> void continueWillSendRequest(const ResourceRequest&);
</span><span class="cx">
</span><span class="cx"> // Called in response to ResourceHandleClient::didReceiveResponseAsync().
</span><del>- void continueDidReceiveResponse();
</del><ins>+ virtual void continueDidReceiveResponse();
</ins><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> // Called in response to ResourceHandleClient::canAuthenticateAgainstProtectionSpaceAsync().
</span></span></pre>
</div>
</div>
</body>
</html>