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

Side by Side Diff: storage/browser/blob/blob_reader.cc

Issue 2709213003: [BlobStorage] Better net error reporting for pre-broken blobs (Closed)
Patch Set: Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "storage/browser/blob/blob_reader.h" 5 #include "storage/browser/blob/blob_reader.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 BlobReader::FileStreamReaderProvider::~FileStreamReaderProvider() {} 68 BlobReader::FileStreamReaderProvider::~FileStreamReaderProvider() {}
69 69
70 BlobReader::BlobReader( 70 BlobReader::BlobReader(
71 const BlobDataHandle* blob_handle, 71 const BlobDataHandle* blob_handle,
72 std::unique_ptr<FileStreamReaderProvider> file_stream_provider, 72 std::unique_ptr<FileStreamReaderProvider> file_stream_provider,
73 base::SequencedTaskRunner* file_task_runner) 73 base::SequencedTaskRunner* file_task_runner)
74 : file_stream_provider_(std::move(file_stream_provider)), 74 : file_stream_provider_(std::move(file_stream_provider)),
75 file_task_runner_(file_task_runner), 75 file_task_runner_(file_task_runner),
76 net_error_(net::OK), 76 net_error_(net::OK),
77 weak_factory_(this) { 77 weak_factory_(this) {
78 if (blob_handle && !blob_handle->IsBroken()) { 78 if (blob_handle) {
79 blob_handle_.reset(new BlobDataHandle(*blob_handle)); 79 if (!blob_handle->IsBroken()) {
pwnall 2017/02/22 23:33:50 How about flipping the if / else, so no (implicit)
dmurph 2017/02/22 23:43:25 Good idea, thanks.
80 blob_handle_.reset(new BlobDataHandle(*blob_handle));
81 } else {
82 net_error_ = ConvertBlobErrorToNetError(blob_handle->GetBlobStatus());
83 }
80 } 84 }
81 } 85 }
82 86
83 BlobReader::~BlobReader() { 87 BlobReader::~BlobReader() {
84 } 88 }
85 89
86 BlobReader::Status BlobReader::CalculateSize( 90 BlobReader::Status BlobReader::CalculateSize(
87 const net::CompletionCallback& done) { 91 const net::CompletionCallback& done) {
88 DCHECK(!total_size_calculated_); 92 DCHECK(!total_size_calculated_);
89 DCHECK(size_callback_.is_null()); 93 DCHECK(size_callback_.is_null());
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 void BlobReader::SetFileReaderAtIndex( 669 void BlobReader::SetFileReaderAtIndex(
666 size_t index, 670 size_t index,
667 std::unique_ptr<FileStreamReader> reader) { 671 std::unique_ptr<FileStreamReader> reader) {
668 if (reader) 672 if (reader)
669 index_to_reader_[index] = std::move(reader); 673 index_to_reader_[index] = std::move(reader);
670 else 674 else
671 index_to_reader_.erase(index); 675 index_to_reader_.erase(index);
672 } 676 }
673 677
674 } // namespace storage 678 } // namespace storage
OLDNEW
« no previous file with comments | « content/browser/blob_storage/blob_url_request_job_unittest.cc ('k') | storage/browser/blob/blob_url_request_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698