mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use CompletionOnceCallback in URLFetcherResponseWriter.

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/1155087
This commit is contained in:
deepak1556 2018-10-26 01:03:23 +05:30
parent 366ca47136
commit 97aa7b8e68
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/net/url_request_fetch_job.cc
View file

@ -55,21 +55,21 @@ class ResponsePiper : public net::URLFetcherResponseWriter {
explicit ResponsePiper(URLRequestFetchJob* job) : job_(job) {} explicit ResponsePiper(URLRequestFetchJob* job) : job_(job) {}
// net::URLFetcherResponseWriter: // net::URLFetcherResponseWriter:
int Initialize(const net::CompletionCallback& callback) override { int Initialize(net::CompletionOnceCallback callback) override {
return net::OK; return net::OK;
} }
int Write(net::IOBuffer* buffer, int Write(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) override { net::CompletionOnceCallback callback) override {
if (first_write_) { if (first_write_) {
// The URLFetcherResponseWriter doesn't have an event when headers have // The URLFetcherResponseWriter doesn't have an event when headers have
// been read, so we have to emulate by hooking to first write event. // been read, so we have to emulate by hooking to first write event.
job_->HeadersCompleted(); job_->HeadersCompleted();
first_write_ = false; first_write_ = false;
} }
return job_->DataAvailable(buffer, num_bytes, callback); return job_->DataAvailable(buffer, num_bytes, std::move(callback));
} }
int Finish(int net_error, const net::CompletionCallback& callback) override { int Finish(int net_error, net::CompletionOnceCallback callback) override {
return net::OK; return net::OK;
} }
@ -231,14 +231,14 @@ void URLRequestFetchJob::HeadersCompleted() {
int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) { net::CompletionOnceCallback callback) {
// When pending_buffer_ is empty, there's no ReadRawData() operation waiting // When pending_buffer_ is empty, there's no ReadRawData() operation waiting
// for IO completion, we have to save the parameters until the request is // for IO completion, we have to save the parameters until the request is
// ready to read data. // ready to read data.
if (!pending_buffer_.get()) { if (!pending_buffer_.get()) {
write_buffer_ = buffer; write_buffer_ = buffer;
write_num_bytes_ = num_bytes; write_num_bytes_ = num_bytes;
write_callback_ = callback; write_callback_ = std::move(callback);
return net::ERR_IO_PENDING; return net::ERR_IO_PENDING;
} }
@ -274,9 +274,9 @@ int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
// Read from the write buffer and clear them after reading. // Read from the write buffer and clear them after reading.
int bytes_read = int bytes_read =
BufferCopy(write_buffer_.get(), write_num_bytes_, dest, dest_size); BufferCopy(write_buffer_.get(), write_num_bytes_, dest, dest_size);
net::CompletionCallback write_callback = write_callback_;
ClearWriteBuffer(); ClearWriteBuffer();
write_callback.Run(bytes_read); if (!write_callback_.is_null())
std::move(write_callback_).Run(bytes_read);
return bytes_read; return bytes_read;
} }
@ -336,7 +336,6 @@ void URLRequestFetchJob::ClearPendingBuffer() {
void URLRequestFetchJob::ClearWriteBuffer() { void URLRequestFetchJob::ClearWriteBuffer() {
write_buffer_ = nullptr; write_buffer_ = nullptr;
write_num_bytes_ = 0; write_num_bytes_ = 0;
write_callback_.Reset();
} }
} // namespace atom } // namespace atom

4
atom/browser/net/url_request_fetch_job.h
View file

@ -36,7 +36,7 @@ class URLRequestFetchJob : public JsAsker,
void HeadersCompleted(); void HeadersCompleted();
int DataAvailable(net::IOBuffer* buffer, int DataAvailable(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback); net::CompletionOnceCallback callback);
protected: protected:
// net::URLRequestJob: // net::URLRequestJob:
@ -69,7 +69,7 @@ class URLRequestFetchJob : public JsAsker,
// Saved arguments passed to DataAvailable. // Saved arguments passed to DataAvailable.
scoped_refptr<net::IOBuffer> write_buffer_; scoped_refptr<net::IOBuffer> write_buffer_;
int write_num_bytes_ = 0; int write_num_bytes_ = 0;
net::CompletionCallback write_callback_; net::CompletionOnceCallback write_callback_;
base::WeakPtrFactory<URLRequestFetchJob> weak_factory_; base::WeakPtrFactory<URLRequestFetchJob> weak_factory_;

12
atom/browser/ui/inspectable_web_contents_impl.cc
View file

@ -141,11 +141,11 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
~ResponseWriter() override; ~ResponseWriter() override;
// URLFetcherResponseWriter overrides: // URLFetcherResponseWriter overrides:
int Initialize(const net::CompletionCallback& callback) override; int Initialize(net::CompletionOnceCallback callback) override;
int Write(net::IOBuffer* buffer, int Write(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) override; net::CompletionOnceCallback callback) override;
int Finish(int net_error, const net::CompletionCallback& callback) override; int Finish(int net_error, net::CompletionOnceCallback callback) override;
private: private:
base::WeakPtr<InspectableWebContentsImpl> bindings_; base::WeakPtr<InspectableWebContentsImpl> bindings_;
@ -161,13 +161,13 @@ ResponseWriter::ResponseWriter(
ResponseWriter::~ResponseWriter() {} ResponseWriter::~ResponseWriter() {}
int ResponseWriter::Initialize(const net::CompletionCallback& callback) { int ResponseWriter::Initialize(net::CompletionOnceCallback callback) {
return net::OK; return net::OK;
} }
int ResponseWriter::Write(net::IOBuffer* buffer, int ResponseWriter::Write(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) { net::CompletionOnceCallback callback) {
std::string chunk = std::string(buffer->data(), num_bytes); std::string chunk = std::string(buffer->data(), num_bytes);
if (!base::IsStringUTF8(chunk)) if (!base::IsStringUTF8(chunk))
return num_bytes; return num_bytes;
@ -184,7 +184,7 @@ int ResponseWriter::Write(net::IOBuffer* buffer,
} }
int ResponseWriter::Finish(int net_error, int ResponseWriter::Finish(int net_error,
const net::CompletionCallback& callback) { net::CompletionOnceCallback callback) {
return net::OK; return net::OK;
} }