<!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>[149499] 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/149499">149499</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-05-02 15:23:25 -0700 (Thu, 02 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (149389) Main resources converted to downloads are immediately cancelled.
&lt;rdar://problem/13795795&gt; and https://bugs.webkit.org/show_bug.cgi?id=115530

Reviewed by Alexey Proskuryakov.

* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload): Call didConvertHandleToDownload
  on the NetworkResourceLoader.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
(WebKit::NetworkResourceLoader::didConvertHandleToDownload): Set m_handleConvertedToDownload to true.
(WebKit::NetworkResourceLoader::abort): Only cancel the handle if m_handleConvertedToDownload is false.
* NetworkProcess/NetworkResourceLoader.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (149498 => 149499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-05-02 22:13:56 UTC (rev 149498)
+++ trunk/Source/WebKit2/ChangeLog        2013-05-02 22:23:25 UTC (rev 149499)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-05-02  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        REGRESSION (149389) Main resources converted to downloads are immediately cancelled.
+        &lt;rdar://problem/13795795&gt; and https://bugs.webkit.org/show_bug.cgi?id=115530
+
+        Reviewed by Alexey Proskuryakov.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload): Call didConvertHandleToDownload
+          on the NetworkResourceLoader.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+        (WebKit::NetworkResourceLoader::didConvertHandleToDownload): Set m_handleConvertedToDownload to true.
+        (WebKit::NetworkResourceLoader::abort): Only cancel the handle if m_handleConvertedToDownload is false.
+        * NetworkProcess/NetworkResourceLoader.h:
+
</ins><span class="cx"> 2013-05-02  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;rdar://problem/13740375&gt; Non-ASCII downloaded file names are garbled when using NetworkProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (149498 => 149499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2013-05-02 22:13:56 UTC (rev 149498)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2013-05-02 22:23:25 UTC (rev 149499)
</span><span class="lines">@@ -172,6 +172,8 @@
</span><span class="cx"> 
</span><span class="cx">     // Unblock the URL connection operation queue.
</span><span class="cx">     loader-&gt;handle()-&gt;continueDidReceiveResponse();
</span><ins>+    
+    loader-&gt;didConvertHandleToDownload();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void NetworkConnectionToWebProcess::cookiesForDOM(bool privateBrowsingEnabled, const KURL&amp; firstParty, const KURL&amp; url, String&amp; result)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (149498 => 149499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2013-05-02 22:13:56 UTC (rev 149498)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2013-05-02 22:23:25 UTC (rev 149499)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> NetworkResourceLoader::NetworkResourceLoader(const NetworkResourceLoadParameters&amp; loadParameters, NetworkConnectionToWebProcess* connection)
</span><span class="cx">     : SchedulableLoader(loadParameters, connection)
</span><span class="cx">     , m_bytesReceived(0)
</span><ins>+    , m_handleConvertedToDownload(false)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx"> }
</span><span class="lines">@@ -116,11 +117,17 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void NetworkResourceLoader::didConvertHandleToDownload()
+{
+    ASSERT(m_handle);
+    m_handleConvertedToDownload = true;
+}
+
</ins><span class="cx"> void NetworkResourceLoader::abort()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx"> 
</span><del>-    if (m_handle)
</del><ins>+    if (m_handle &amp;&amp; !m_handleConvertedToDownload)
</ins><span class="cx">         m_handle-&gt;cancel();
</span><span class="cx"> 
</span><span class="cx">     cleanup();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (149498 => 149499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2013-05-02 22:13:56 UTC (rev 149498)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2013-05-02 22:23:25 UTC (rev 149499)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx">     uint64_t destinationID() const;
</span><span class="cx"> 
</span><span class="cx">     WebCore::ResourceHandle* handle() const { return m_handle.get(); }
</span><ins>+    void didConvertHandleToDownload();
</ins><span class="cx"> 
</span><span class="cx">     virtual void start() OVERRIDE;
</span><span class="cx">     virtual void abort() OVERRIDE;
</span><span class="lines">@@ -126,6 +127,8 @@
</span><span class="cx"> 
</span><span class="cx">     uint64_t m_bytesReceived;
</span><span class="cx"> 
</span><ins>+    bool m_handleConvertedToDownload;
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</span><span class="cx">     static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&amp;, WebCore::SharedBuffer*);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>