Title: [149500] tags/Safari-537.40/Source/WebKit2
- Revision
- 149500
- Author
- [email protected]
- Date
- 2013-05-02 15:39:13 -0700 (Thu, 02 May 2013)
Log Message
Merged r149499. <rdar://problem/13795795>
Modified Paths
Diff
Modified: tags/Safari-537.40/Source/WebKit2/ChangeLog (149499 => 149500)
--- tags/Safari-537.40/Source/WebKit2/ChangeLog 2013-05-02 22:23:25 UTC (rev 149499)
+++ tags/Safari-537.40/Source/WebKit2/ChangeLog 2013-05-02 22:39:13 UTC (rev 149500)
@@ -1,5 +1,26 @@
2013-05-02 Lucas Forschler <[email protected]>
+ Merge r149499
+
+ 2013-05-02 Brady Eidson <[email protected]>
+
+ REGRESSION (149389) Main resources converted to downloads are immediately cancelled.
+ <rdar://problem/13795795> 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:
+
+2013-05-02 Lucas Forschler <[email protected]>
+
Merge r149488
2013-05-01 Alexey Proskuryakov <[email protected]>
Modified: tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (149499 => 149500)
--- tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-05-02 22:23:25 UTC (rev 149499)
+++ tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-05-02 22:39:13 UTC (rev 149500)
@@ -172,6 +172,8 @@
// Unblock the URL connection operation queue.
loader->handle()->continueDidReceiveResponse();
+
+ loader->didConvertHandleToDownload();
}
void NetworkConnectionToWebProcess::cookiesForDOM(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, String& result)
Modified: tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (149499 => 149500)
--- tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-05-02 22:23:25 UTC (rev 149499)
+++ tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-05-02 22:39:13 UTC (rev 149500)
@@ -54,6 +54,7 @@
NetworkResourceLoader::NetworkResourceLoader(const NetworkResourceLoadParameters& loadParameters, NetworkConnectionToWebProcess* connection)
: SchedulableLoader(loadParameters, connection)
, m_bytesReceived(0)
+ , m_handleConvertedToDownload(false)
{
ASSERT(isMainThread());
}
@@ -116,11 +117,17 @@
return result;
}
+void NetworkResourceLoader::didConvertHandleToDownload()
+{
+ ASSERT(m_handle);
+ m_handleConvertedToDownload = true;
+}
+
void NetworkResourceLoader::abort()
{
ASSERT(isMainThread());
- if (m_handle)
+ if (m_handle && !m_handleConvertedToDownload)
m_handle->cancel();
cleanup();
Modified: tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (149499 => 149500)
--- tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-05-02 22:23:25 UTC (rev 149499)
+++ tags/Safari-537.40/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-05-02 22:39:13 UTC (rev 149500)
@@ -61,6 +61,7 @@
uint64_t destinationID() const;
WebCore::ResourceHandle* handle() const { return m_handle.get(); }
+ void didConvertHandleToDownload();
virtual void start() OVERRIDE;
virtual void abort() OVERRIDE;
@@ -126,6 +127,8 @@
uint64_t m_bytesReceived;
+ bool m_handleConvertedToDownload;
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&, WebCore::SharedBuffer*);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
