diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-23 16:06:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-24 11:41:55 +0000 |
commit | bac1035f131c0b95b75fb39ffd1a39652843de9f (patch) | |
tree | 44839fddbea648d54e4be47bcfbe4a5979bacd29 /chromium/components/download | |
parent | 271a6c3487a14599023a9106329505597638d793 (diff) | |
download | qtwebengine-chromium-bac1035f131c0b95b75fb39ffd1a39652843de9f.tar.gz |
BASELINE: Update Chromium to 77.0.3865.98
Change-Id: Ice85979eb8b64af9a3c649d719bec6ea14ac3bf7
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/download')
4 files changed, 12 insertions, 2 deletions
diff --git a/chromium/components/download/internal/common/download_create_info.cc b/chromium/components/download/internal/common/download_create_info.cc index b875d995273..20881b0be7b 100644 --- a/chromium/components/download/internal/common/download_create_info.cc +++ b/chromium/components/download/internal/common/download_create_info.cc @@ -31,7 +31,8 @@ DownloadCreateInfo::DownloadCreateInfo( accept_range(RangeRequestSupportType::kNoSupport), connection_info(net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN), method("GET"), - ukm_source_id(ukm::kInvalidSourceId) {} + ukm_source_id(ukm::kInvalidSourceId), + is_content_initiated(false) {} DownloadCreateInfo::DownloadCreateInfo() : DownloadCreateInfo(base::Time(), base::WrapUnique(new DownloadSaveInfo)) { diff --git a/chromium/components/download/internal/common/resource_downloader.cc b/chromium/components/download/internal/common/resource_downloader.cc index aaeef1a691f..15de44ecd42 100644 --- a/chromium/components/download/internal/common/resource_downloader.cc +++ b/chromium/components/download/internal/common/resource_downloader.cc @@ -139,7 +139,8 @@ ResourceDownloader::ResourceDownloader( tab_referrer_url_(tab_referrer_url), delegate_task_runner_(task_runner), url_loader_factory_getter_(std::move(url_loader_factory_getter)), - url_security_policy_(url_security_policy) { + url_security_policy_(url_security_policy), + is_content_initiated_(false) { RequestWakeLock(connector.get()); } @@ -152,6 +153,7 @@ void ResourceDownloader::Start( callback_ = download_url_parameters->callback(); upload_callback_ = download_url_parameters->upload_callback(); guid_ = download_url_parameters->guid(); + is_content_initiated_ = download_url_parameters->content_initiated(); // Set up the URLLoaderClient. url_loader_client_ = std::make_unique<DownloadResponseHandler>( @@ -235,6 +237,7 @@ void ResourceDownloader::OnResponseStarted( download_create_info->render_process_id = render_process_id_; download_create_info->render_frame_id = render_frame_id_; download_create_info->has_user_gesture = resource_request_->has_user_gesture; + download_create_info->is_content_initiated = is_content_initiated_; delegate_task_runner_->PostTask( FROM_HERE, diff --git a/chromium/components/download/internal/common/resource_downloader.h b/chromium/components/download/internal/common/resource_downloader.h index ed355ee35be..230269b856d 100644 --- a/chromium/components/download/internal/common/resource_downloader.h +++ b/chromium/components/download/internal/common/resource_downloader.h @@ -169,6 +169,9 @@ class COMPONENTS_DOWNLOAD_EXPORT ResourceDownloader // Used to check if the URL is safe to request. URLSecurityPolicy url_security_policy_; + // Whether download is initated by the content on the page. + bool is_content_initiated_; + // Used to keep the system from sleeping while a download is ongoing. If the // system enters power saving mode while a download is alive, it can cause // download to be interrupted. diff --git a/chromium/components/download/public/common/download_create_info.h b/chromium/components/download/public/common/download_create_info.h index 0e97e309a85..84553dc1b97 100644 --- a/chromium/components/download/public/common/download_create_info.h +++ b/chromium/components/download/public/common/download_create_info.h @@ -178,6 +178,9 @@ struct COMPONENTS_DOWNLOAD_EXPORT DownloadCreateInfo { // Source of the download, used in metrics. DownloadSource download_source = DownloadSource::UNKNOWN; + // Whether download is initated by the content on the page. + bool is_content_initiated; + private: DISALLOW_COPY_AND_ASSIGN(DownloadCreateInfo); }; |