Diff
Modified: trunk/Source/WebKit2/ChangeLog (137612 => 137613)
--- trunk/Source/WebKit2/ChangeLog 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-13 18:44:09 UTC (rev 137613)
@@ -1,3 +1,38 @@
+2012-12-13 Anders Carlsson <[email protected]>
+
+ Remove unused initiatingPage parameter from download objects
+ https://bugs.webkit.org/show_bug.cgi?id=104933
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/Downloads/Download.h:
+ (Download):
+ * WebProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ (WebKit::DownloadManager::convertHandleToDownload):
+ * WebProcess/Downloads/DownloadManager.h:
+ (DownloadManager):
+ * WebProcess/Downloads/cfnet/DownloadCFNet.cpp:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ * WebProcess/Downloads/curl/DownloadCurl.cpp:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ * WebProcess/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ * WebProcess/Downloads/qt/DownloadQt.cpp:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ * WebProcess/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::startDownload):
+ (WebKit::WebFrame::convertHandleToDownload):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::downloadRequest):
+
2012-12-13 Alexey Proskuryakov <[email protected]>
<rdar://problem/12870065> Frequent NetworkProcess crashes due to null connection when closing tabs
Modified: trunk/Source/WebKit2/WebProcess/Downloads/Download.h (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/Download.h 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/Download.h 2012-12-13 18:44:09 UTC (rev 137613)
@@ -79,8 +79,8 @@
CoreIPC::Connection* connection() const;
uint64_t destinationID() const { return downloadID(); }
- void start(WebPage* initiatingWebPage);
- void startWithHandle(WebPage* initiatingPage, WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
+ void start();
+ void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
void cancel();
uint64_t downloadID() const { return m_downloadID; }
Modified: trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -44,20 +44,20 @@
{
}
-void DownloadManager::startDownload(uint64_t downloadID, WebPage* initiatingPage, const ResourceRequest& request)
+void DownloadManager::startDownload(uint64_t downloadID, const ResourceRequest& request)
{
OwnPtr<Download> download = Download::create(downloadID, request);
- download->start(initiatingPage);
+ download->start();
ASSERT(!m_downloads.contains(downloadID));
m_downloads.set(downloadID, download.leakPtr());
}
-void DownloadManager::convertHandleToDownload(uint64_t downloadID, WebPage* initiatingPage, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
+void DownloadManager::convertHandleToDownload(uint64_t downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
{
OwnPtr<Download> download = Download::create(downloadID, request);
- download->startWithHandle(initiatingPage, handle, response);
+ download->startWithHandle(handle, response);
ASSERT(!m_downloads.contains(downloadID));
m_downloads.set(downloadID, download.leakPtr());
}
Modified: trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.h (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.h 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/DownloadManager.h 2012-12-13 18:44:09 UTC (rev 137613)
@@ -50,8 +50,8 @@
public:
static DownloadManager& shared();
- void startDownload(uint64_t downloadID, WebPage* initiatingPage, const WebCore::ResourceRequest&);
- void convertHandleToDownload(uint64_t downloadID, WebPage* initiatingPage, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+ void startDownload(uint64_t downloadID, const WebCore::ResourceRequest&);
+ void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
void cancelDownload(uint64_t downloadID);
Modified: trunk/Source/WebKit2/WebProcess/Downloads/cfnet/DownloadCFNet.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/cfnet/DownloadCFNet.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/cfnet/DownloadCFNet.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -86,7 +86,7 @@
return m_authenticationClient.get();
}
-void Download::start(WebPage*)
+void Download::start()
{
ASSERT(!m_download);
@@ -108,7 +108,7 @@
CFURLDownloadStart(m_download.get());
}
-void Download::startWithHandle(WebPage*, ResourceHandle* handle, const ResourceResponse& response)
+void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
{
ASSERT(!m_download);
Modified: trunk/Source/WebKit2/WebProcess/Downloads/curl/DownloadCurl.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/curl/DownloadCurl.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/curl/DownloadCurl.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -33,12 +33,12 @@
namespace WebKit {
-void Download::start(WebPage* initiatingWebPage)
+void Download::start()
{
notImplemented();
}
-void Download::startWithHandle(WebPage* initiatingPage, ResourceHandle*, const ResourceResponse&)
+void Download::startWithHandle(ResourceHandle*, const ResourceResponse&)
{
notImplemented();
}
Modified: trunk/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm 2012-12-13 18:44:09 UTC (rev 137613)
@@ -52,7 +52,7 @@
namespace WebKit {
-void Download::start(WebPage* initiatingPage)
+void Download::start()
{
ASSERT(!m_nsURLDownload);
ASSERT(!m_delegate);
@@ -64,7 +64,7 @@
[m_nsURLDownload.get() setDeletesFileUponFailure:NO];
}
-void Download::startWithHandle(WebPage* initiatingPage, ResourceHandle* handle, const ResourceResponse& response)
+void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
{
ASSERT(!m_nsURLDownload);
ASSERT(!m_delegate);
Modified: trunk/Source/WebKit2/WebProcess/Downloads/qt/DownloadQt.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/qt/DownloadQt.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/qt/DownloadQt.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -39,7 +39,7 @@
namespace WebKit {
-void Download::start(WebPage* initiatingWebPage)
+void Download::start()
{
QNetworkAccessManager* manager = WebProcess::shared().networkAccessManager();
ASSERT(manager);
@@ -49,7 +49,7 @@
m_qtDownloader->init();
}
-void Download::startWithHandle(WebPage* initiatingPage, ResourceHandle* handle, const ResourceResponse& resp)
+void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& resp)
{
ASSERT(!m_qtDownloader);
m_qtDownloader = new QtFileDownloader(this, adoptPtr(handle->getInternal()->m_job->release()));
Modified: trunk/Source/WebKit2/WebProcess/Downloads/soup/DownloadSoup.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/Downloads/soup/DownloadSoup.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/Downloads/soup/DownloadSoup.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -179,7 +179,7 @@
unsigned m_handleResponseLaterID;
};
-void Download::start(WebPage*)
+void Download::start()
{
ASSERT(!m_downloadClient);
ASSERT(!m_resourceHandle);
@@ -188,7 +188,7 @@
didStart();
}
-void Download::startWithHandle(WebPage*, ResourceHandle* resourceHandle, const ResourceResponse& response)
+void Download::startWithHandle(ResourceHandle* resourceHandle, const ResourceResponse& response)
{
ASSERT(!m_downloadClient);
ASSERT(!m_resourceHandle);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -236,7 +236,7 @@
{
ASSERT(m_policyDownloadID);
- DownloadManager::shared().startDownload(m_policyDownloadID, page(), request);
+ DownloadManager::shared().startDownload(m_policyDownloadID, request);
m_policyDownloadID = 0;
}
@@ -245,7 +245,7 @@
{
ASSERT(m_policyDownloadID);
- DownloadManager::shared().convertHandleToDownload(m_policyDownloadID, page(), handle, request, response);
+ DownloadManager::shared().convertHandleToDownload(m_policyDownloadID, handle, request, response);
m_policyDownloadID = 0;
}
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (137612 => 137613)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-13 18:39:39 UTC (rev 137612)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-13 18:44:09 UTC (rev 137613)
@@ -1143,7 +1143,7 @@
if (initiatingPage)
initiatingPage->mainFrame()->loader()->setOriginalURLForDownloadRequest(requestWithOriginalURL);
- DownloadManager::shared().startDownload(downloadID, initiatingPage, requestWithOriginalURL);
+ DownloadManager::shared().startDownload(downloadID, requestWithOriginalURL);
}
void WebProcess::cancelDownload(uint64_t downloadID)
