diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/WebProcess/Downloads | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/WebProcess/Downloads')
| -rw-r--r-- | Source/WebKit2/WebProcess/Downloads/Download.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/Downloads/Download.cpp b/Source/WebKit2/WebProcess/Downloads/Download.cpp index 3fc87d9..ff0482b 100644 --- a/Source/WebKit2/WebProcess/Downloads/Download.cpp +++ b/Source/WebKit2/WebProcess/Downloads/Download.cpp @@ -52,11 +52,15 @@ Download::Download(uint64_t downloadID, const ResourceRequest& request) #endif { ASSERT(m_downloadID); + + WebProcess::shared().disableTermination(); } Download::~Download() { platformInvalidate(); + + WebProcess::shared().enableTermination(); } CoreIPC::Connection* Download::connection() const diff --git a/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp b/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp index 4a96b11..a624891 100644 --- a/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp +++ b/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp @@ -77,8 +77,6 @@ void DownloadManager::downloadFinished(Download* download) m_downloads.remove(download->downloadID()); delete download; - - WebProcess::shared().terminateIfPossible(); } } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm b/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm index 2d09612..aacdf0b 100644 --- a/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm +++ b/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm @@ -45,7 +45,7 @@ - (void)_setOriginatingURL:(NSURL *)originatingURL; @end -@interface WKDownloadAsDelegate : NSObject <NSURLConnectionDelegate> { +@interface WKDownloadAsDelegate : NSObject <NSURLDownloadDelegate> { WebKit::Download* _download; } - (id)initWithDownload:(WebKit::Download*)download; |