Title: [137846] trunk/Source/WebKit2
- Revision
- 137846
- Author
- [email protected]
- Date
- 2012-12-16 12:57:09 -0800 (Sun, 16 Dec 2012)
Log Message
Rename WebFrame::convertHandleToDownload to convertMainResourceLoadToDownload
https://bugs.webkit.org/show_bug.cgi?id=105134
Reviewed by Sam Weinig.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::convertMainResourceLoadToDownload):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::convertMainResourceLoadToDownload):
* WebProcess/WebPage/WebFrame.h:
(WebFrame):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137845 => 137846)
--- trunk/Source/WebKit2/ChangeLog 2012-12-16 20:30:40 UTC (rev 137845)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-16 20:57:09 UTC (rev 137846)
@@ -1,3 +1,17 @@
+2012-12-16 Anders Carlsson <[email protected]>
+
+ Rename WebFrame::convertHandleToDownload to convertMainResourceLoadToDownload
+ https://bugs.webkit.org/show_bug.cgi?id=105134
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::convertMainResourceLoadToDownload):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::convertMainResourceLoadToDownload):
+ * WebProcess/WebPage/WebFrame.h:
+ (WebFrame):
+
2012-12-15 Anders Carlsson <[email protected]>
Rename FrameLoaderClient::download to convertMainResourceLoadToDownload
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (137845 => 137846)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-16 20:30:40 UTC (rev 137845)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-16 20:57:09 UTC (rev 137846)
@@ -63,7 +63,6 @@
#include <WebCore/HTMLFormElement.h>
#include <WebCore/HistoryItem.h>
#include <WebCore/MIMETypeRegistry.h>
-#include <WebCore/MainResourceLoader.h>
#include <WebCore/MouseEvent.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/Page.h>
@@ -1286,7 +1285,7 @@
void WebFrameLoaderClient::convertMainResourceLoadToDownload(MainResourceLoader *mainResourceLoader, const ResourceRequest& request, const ResourceResponse& response)
{
- m_frame->convertHandleToDownload(mainResourceLoader->loader()->handle(), request, response);
+ m_frame->convertMainResourceLoadToDownload(mainResourceLoader, request, response);
}
PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (137845 => 137846)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2012-12-16 20:30:40 UTC (rev 137845)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2012-12-16 20:57:09 UTC (rev 137846)
@@ -54,6 +54,7 @@
#include <WebCore/JSCSSStyleDeclaration.h>
#include <WebCore/JSElement.h>
#include <WebCore/JSRange.h>
+#include <WebCore/MainResourceLoader.h>
#include <WebCore/NodeTraversal.h>
#include <WebCore/Page.h>
#include <WebCore/PluginDocument.h>
@@ -256,12 +257,21 @@
WebProcess::shared().downloadManager().startDownload(policyDownloadID, request);
}
-void WebFrame::convertHandleToDownload(ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
+void WebFrame::convertMainResourceLoadToDownload(MainResourceLoader* mainResourceLoader, const ResourceRequest& request, const ResourceResponse& response)
{
ASSERT(m_policyDownloadID);
- WebProcess::shared().downloadManager().convertHandleToDownload(m_policyDownloadID, handle, request, response);
+ uint64_t policyDownloadID = m_policyDownloadID;
m_policyDownloadID = 0;
+
+#if ENABLE(NETWORK_PROCESS)
+ if (WebProcess::shared().usesNetworkProcess()) {
+ // FIXME: Handle this case.
+ return;
+ }
+#endif
+
+ WebProcess::shared().downloadManager().convertHandleToDownload(policyDownloadID, mainResourceLoader->loader()->handle(), request, response);
}
#if ENABLE(WEB_INTENTS)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (137845 => 137846)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2012-12-16 20:30:40 UTC (rev 137845)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2012-12-16 20:57:09 UTC (rev 137846)
@@ -83,7 +83,7 @@
void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t downloadID);
void startDownload(const WebCore::ResourceRequest&);
- void convertHandleToDownload(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+ void convertMainResourceLoadToDownload(WebCore::MainResourceLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
#if ENABLE(WEB_INTENTS)
void deliverIntent(const IntentData&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
