Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: content/browser/download/parallel_download_job.cc

Issue 2767593003: Handle early pause, cancel for parallel requests. (Closed)
Patch Set: Work on feedback. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/download/parallel_download_job.cc
diff --git a/content/browser/download/parallel_download_job.cc b/content/browser/download/parallel_download_job.cc
index 1a8b93059b30f1c12f7d4801becd6a38bda5c651..92924c7322214c16bd664be8fe9c133ba08d53ac 100644
--- a/content/browser/download/parallel_download_job.cc
+++ b/content/browser/download/parallel_download_job.cc
@@ -11,6 +11,11 @@
#include "content/public/browser/storage_partition.h"
namespace content {
+namespace {
+
+const int kVerboseLevel = 1;
+
+} // namespace
ParallelDownloadJob::ParallelDownloadJob(
DownloadItemImpl* download_item,
@@ -85,8 +90,15 @@ void ParallelDownloadJob::BuildParallelRequestAfterDelay() {
void ParallelDownloadJob::OnByteStreamReady(
DownloadWorker* worker,
std::unique_ptr<ByteStreamReader> stream_reader) {
- DownloadJob::AddByteStream(std::move(stream_reader), worker->offset(),
- worker->length());
+ bool success = DownloadJob::AddByteStream(std::move(stream_reader),
+ worker->offset(), worker->length());
+
+ // Destroy the request if the sink is gone.
+ if (!success) {
+ VLOG(kVerboseLevel)
+ << "Byte stream arrived after download file is released.";
+ worker->Cancel();
+ }
}
void ParallelDownloadJob::OnServerResponseError(
@@ -98,6 +110,14 @@ void ParallelDownloadJob::OnServerResponseError(
DownloadJob::Interrupt(reason);
}
+bool ParallelDownloadJob::IsPaused() const {
+ return DownloadJob::is_paused();
+}
+
+bool ParallelDownloadJob::IsCanceled() const {
+ return DownloadJob::is_canceled();
+}
+
void ParallelDownloadJob::BuildParallelRequests() {
DCHECK(!requests_sent_);
// TODO(qinmin): The size of |slices_to_download| should be no larger than

Powered by Google App Engine
This is Rietveld 408576698