diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/content/browser/devtools/devtools_io_context.cc | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
| download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/devtools/devtools_io_context.cc')
| -rw-r--r-- | chromium/content/browser/devtools/devtools_io_context.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/chromium/content/browser/devtools/devtools_io_context.cc b/chromium/content/browser/devtools/devtools_io_context.cc index 4598f165337..98488055870 100644 --- a/chromium/content/browser/devtools/devtools_io_context.cc +++ b/chromium/content/browser/devtools/devtools_io_context.cc @@ -84,7 +84,7 @@ TempFileStream::~TempFileStream() { bool TempFileStream::InitOnFileSequenceIfNeeded() { DCHECK(task_runner_->RunsTasksInCurrentSequence()); - base::ThreadRestrictions::AssertIOAllowed(); + base::AssertBlockingAllowed(); if (had_errors_) return false; if (file_.IsValid()) @@ -206,7 +206,6 @@ class BlobStream : public DevToolsIOContext::ROStream { ~BlobStream() override = default; void OpenOnIO(scoped_refptr<ChromeBlobStorageContext> blob_context, - scoped_refptr<storage::FileSystemContext> fs_context, const std::string& uuid, OpenCallback callback); void ReadOnIO(std::unique_ptr<ReadRequest> request); @@ -231,7 +230,6 @@ class BlobStream : public DevToolsIOContext::ROStream { std::unique_ptr<storage::BlobDataHandle> blob_handle_; OpenCallback open_callback_; - scoped_refptr<storage::FileSystemContext> fs_context_; std::unique_ptr<BlobReader> blob_reader_; base::queue<std::unique_ptr<ReadRequest>> pending_reads_; scoped_refptr<net::IOBufferWithSize> io_buf_; @@ -265,12 +263,9 @@ void BlobStream::Open(scoped_refptr<ChromeBlobStorageContext> context, StoragePartition* partition, const std::string& handle, OpenCallback callback) { - scoped_refptr<storage::FileSystemContext> fs_context = - partition->GetFileSystemContext(); - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&BlobStream::OpenOnIO, this, context, fs_context, handle, - std::move(callback))); + BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, + base::BindOnce(&BlobStream::OpenOnIO, this, context, + handle, std::move(callback))); } void BlobStream::Read(off_t position, size_t max_size, ReadCallback callback) { @@ -288,7 +283,6 @@ void BlobStream::Close(bool invoke_pending_callbacks) { } void BlobStream::OpenOnIO(scoped_refptr<ChromeBlobStorageContext> blob_context, - scoped_refptr<storage::FileSystemContext> fs_context, const std::string& uuid, OpenCallback callback) { DCHECK(!blob_handle_); @@ -302,7 +296,6 @@ void BlobStream::OpenOnIO(scoped_refptr<ChromeBlobStorageContext> blob_context, } is_binary_ = !IsTextMimeType(blob_handle_->content_type()); open_callback_ = std::move(callback); - fs_context_ = std::move(fs_context); blob_handle_->RunOnConstructionComplete( base::Bind(&BlobStream::OnBlobConstructionComplete, this)); } @@ -426,7 +419,7 @@ void BlobStream::OnReadComplete(int bytes_read) { void BlobStream::CreateReader() { DCHECK(!blob_reader_); - blob_reader_ = blob_handle_->CreateReader(fs_context_.get()); + blob_reader_ = blob_handle_->CreateReader(); BlobReader::Status status = blob_reader_->CalculateSize( base::Bind(&BlobStream::OnCalculateSizeComplete, this)); if (status != BlobReader::Status::IO_PENDING) { |