From d8cd3d78ff7411a7c610838c78ad975bd63d477e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 30 Aug 2013 20:38:06 +0800 Subject: [PATCH] Make ReadRawData a public member, so there is no need to detect types. --- browser/net/adapter_request_job.cc | 15 +-------------- browser/net/adapter_request_job.h | 10 +--------- vendor/brightray | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/browser/net/adapter_request_job.cc b/browser/net/adapter_request_job.cc index 382325b..ddf66fa 100644 --- a/browser/net/adapter_request_job.cc +++ b/browser/net/adapter_request_job.cc @@ -38,17 +38,7 @@ bool AdapterRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read) { DCHECK(real_job_); - // The ReadRawData is a protected method. - switch (type_) { - case REQUEST_STRING_JOB: - return static_cast(real_job_.get())-> - ReadRawData(buf, buf_size, bytes_read); - case REQUEST_FILE_JOB: - return static_cast(real_job_.get())-> - ReadRawData(buf, buf_size, bytes_read); - default: - return net::URLRequestJob::ReadRawData(buf, buf_size, bytes_read); - } + return real_job_->ReadRawData(buf, buf_size, bytes_read); } bool AdapterRequestJob::IsRedirectResponse(GURL* location, @@ -79,7 +69,6 @@ base::WeakPtr AdapterRequestJob::GetWeakPtr() { void AdapterRequestJob::CreateErrorJobAndStart(int error_code) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); - type_ = REQUEST_ERROR_JOB; real_job_ = new net::URLRequestErrorJob( request(), network_delegate(), error_code); real_job_->Start(); @@ -90,7 +79,6 @@ void AdapterRequestJob::CreateStringJobAndStart(const std::string& mime_type, const std::string& data) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); - type_ = REQUEST_STRING_JOB; real_job_ = new URLRequestStringJob( request(), network_delegate(), mime_type, charset, data); real_job_->Start(); @@ -99,7 +87,6 @@ void AdapterRequestJob::CreateStringJobAndStart(const std::string& mime_type, void AdapterRequestJob::CreateFileJobAndStart(const base::FilePath& path) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); - type_ = REQUEST_FILE_JOB; real_job_ = new net::URLRequestFileJob(request(), network_delegate(), path); real_job_->Start(); } diff --git a/browser/net/adapter_request_job.h b/browser/net/adapter_request_job.h index af03755..7b7ed90 100644 --- a/browser/net/adapter_request_job.h +++ b/browser/net/adapter_request_job.h @@ -52,17 +52,9 @@ class AdapterRequestJob : public net::URLRequestJob { void CreateJobFromProtocolHandlerAndStart(); private: - enum JOB_TYPE { - REQUEST_ERROR_JOB, - REQUEST_STRING_JOB, - REQUEST_FILE_JOB, - }; - + // The delegated request job. scoped_refptr real_job_; - // Type of the delegated url request job. - JOB_TYPE type_; - // Default protocol handler. ProtocolHandler* protocol_handler_; diff --git a/vendor/brightray b/vendor/brightray index c62f91a..3cb2782 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit c62f91a82e5426996d149dcb63259f967a7e78fb +Subproject commit 3cb2782cff77081df2788c68948163dea53530d5 -- 2.7.4