| Index: webkit/glue/weburlloader_impl.cc
|
| ===================================================================
|
| --- webkit/glue/weburlloader_impl.cc (revision 53197)
|
| +++ webkit/glue/weburlloader_impl.cc (working copy)
|
| @@ -182,6 +182,7 @@
|
| response->setWasFetchedViaProxy(info.was_fetched_via_proxy);
|
| response->setConnectionID(info.connection_id);
|
| response->setConnectionReused(info.connection_reused);
|
| + response->setDownloadFilePath(FilePathToWebString(info.download_file_path));
|
|
|
| WebURLLoadTiming timing;
|
| timing.initialize();
|
| @@ -213,7 +214,7 @@
|
| // pass it to GetSuggestedFilename.
|
| std::string value;
|
| if (headers->EnumerateHeader(NULL, "content-disposition", &value)) {
|
| - response->setSuggestedFileName(webkit_glue::FilePathToWebString(
|
| + response->setSuggestedFileName(FilePathToWebString(
|
| net::GetSuggestedFilename(url, value, "", FilePath())));
|
| }
|
|
|
| @@ -260,6 +261,7 @@
|
| GURL* new_first_party_for_cookies);
|
| virtual void OnReceivedResponse(
|
| const ResourceLoaderBridge::ResponseInfo& info, bool content_filtered);
|
| + virtual void OnDownloadedData(int len);
|
| virtual void OnReceivedData(const char* data, int len);
|
| virtual void OnReceivedCachedMetadata(const char* data, int len);
|
| virtual void OnCompletedRequest(
|
| @@ -384,7 +386,7 @@
|
| // TODO(brettw) this should take parameter encoding into account when
|
| // creating the GURLs.
|
|
|
| - webkit_glue::ResourceLoaderBridge::RequestInfo request_info;
|
| + ResourceLoaderBridge::RequestInfo request_info;
|
| request_info.method = method;
|
| request_info.url = url;
|
| request_info.first_party_for_cookies = request.firstPartyForCookies();
|
| @@ -397,6 +399,7 @@
|
| request_info.request_type = FromTargetType(request.targetType());
|
| request_info.appcache_host_id = request.appCacheHostID();
|
| request_info.routing_id = request.requestorID();
|
| + request_info.download_to_file = request.downloadToFile();
|
| bridge_.reset(ResourceLoaderBridge::Create(request_info));
|
|
|
| if (!request.httpBody().isNull()) {
|
| @@ -545,6 +548,11 @@
|
| response_url_ = response.url();
|
| }
|
|
|
| +void WebURLLoaderImpl::Context::OnDownloadedData(int len) {
|
| + if (client_)
|
| + client_->didDownloadData(loader_, len);
|
| +}
|
| +
|
| void WebURLLoaderImpl::Context::OnReceivedData(const char* data, int len) {
|
| if (!client_)
|
| return;
|
|
|