Title: [101607] trunk/Source
- Revision
- 101607
- Author
- [email protected]
- Date
- 2011-11-30 21:55:33 -0800 (Wed, 30 Nov 2011)
Log Message
Original page URL is not set in quarantine information when downloading using context menu Save Linked File
https://bugs.webkit.org/show_bug.cgi?id=73475
<rdar://problem/10500337>
Reviewed by Dan Bernstein.
Source/WebCore:
* WebCore.exp.in: Exported FrameLoader::setOriginalURLForDownloadRequest.
Source/WebKit2:
* WebProcess/WebProcess.cpp: (WebKit::WebProcess::downloadRequest): Set main document URL
for the request, so that CFNetwork would know where te file was downloaded. Note that this
is an easier case than downloading due to clicks, since we don't really need to build a host
only URL, and could use full page URL. However, the same function is used for consistency.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101606 => 101607)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 05:44:30 UTC (rev 101606)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 05:55:33 UTC (rev 101607)
@@ -1,3 +1,13 @@
+2011-11-30 Alexey Proskuryakov <[email protected]>
+
+ Original page URL is not set in quarantine information when downloading using context menu Save Linked File
+ https://bugs.webkit.org/show_bug.cgi?id=73475
+ <rdar://problem/10500337>
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.exp.in: Exported FrameLoader::setOriginalURLForDownloadRequest.
+
2011-11-30 Mark Pilgrim <[email protected]>
[FileSystem API] DirectoryEntry.getFile path argument is required
Modified: trunk/Source/WebCore/WebCore.exp.in (101606 => 101607)
--- trunk/Source/WebCore/WebCore.exp.in 2011-12-01 05:44:30 UTC (rev 101606)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-12-01 05:55:33 UTC (rev 101607)
@@ -175,6 +175,7 @@
__ZN7WebCore11FrameLoader22findFrameForNavigationERKN3WTF12AtomicStringE
__ZN7WebCore11FrameLoader23timeOfLastCompletedLoadEv
__ZN7WebCore11FrameLoader26reloadWithOverrideEncodingERKN3WTF6StringE
+__ZN7WebCore11FrameLoader32setOriginalURLForDownloadRequestERNS_15ResourceRequestE
__ZN7WebCore11FrameLoader4initEv
__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestERKN3WTF6StringEb
__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestERKNS_14SubstituteDataEb
Modified: trunk/Source/WebKit2/ChangeLog (101606 => 101607)
--- trunk/Source/WebKit2/ChangeLog 2011-12-01 05:44:30 UTC (rev 101606)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-01 05:55:33 UTC (rev 101607)
@@ -1,3 +1,16 @@
+2011-11-30 Alexey Proskuryakov <[email protected]>
+
+ Original page URL is not set in quarantine information when downloading using context menu Save Linked File
+ https://bugs.webkit.org/show_bug.cgi?id=73475
+ <rdar://problem/10500337>
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebProcess.cpp: (WebKit::WebProcess::downloadRequest): Set main document URL
+ for the request, so that CFNetwork would know where te file was downloaded. Note that this
+ is an easier case than downloading due to clicks, since we don't really need to build a host
+ only URL, and could use full page URL. However, the same function is used for consistency.
+
2011-11-30 Igor Oliveira <[email protected]>
[WK2][Qt] AC animation startTime is wrong
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (101606 => 101607)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-01 05:44:30 UTC (rev 101606)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-01 05:55:33 UTC (rev 101607)
@@ -59,6 +59,7 @@
#include <WebCore/CrossOriginPreflightResultCache.h>
#include <WebCore/Font.h>
#include <WebCore/FontCache.h>
+#include <WebCore/Frame.h>
#include <WebCore/GCController.h>
#include <WebCore/GlyphPageTreeNode.h>
#include <WebCore/IconDatabase.h>
@@ -951,7 +952,10 @@
{
WebPage* initiatingPage = initiatingPageID ? webPage(initiatingPageID) : 0;
- DownloadManager::shared().startDownload(downloadID, initiatingPage, request);
+ ResourceRequest requestWithOriginalURL = request;
+ initiatingPage->mainFrame()->loader()->setOriginalURLForDownloadRequest(requestWithOriginalURL);
+
+ DownloadManager::shared().startDownload(downloadID, initiatingPage, requestWithOriginalURL);
}
void WebProcess::cancelDownload(uint64_t downloadID)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
