diff options
Diffstat (limited to 'content/browser/loader/resource_loader.cc')
| -rw-r--r-- | content/browser/loader/resource_loader.cc | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc index 450f193..0becbf4 100644 --- a/content/browser/loader/resource_loader.cc +++ b/content/browser/loader/resource_loader.cc @@ -99,8 +99,7 @@ void ResourceLoader::StartRequest() { // Give the handler a chance to delay the URLRequest from being started. bool defer_start = false; - if (!handler_->OnWillStart(GetRequestInfo()->GetRequestID(), request_->url(), - &defer_start)) { + if (!handler_->OnWillStart(request_->url(), &defer_start)) { Cancel(); return; } @@ -127,8 +126,6 @@ void ResourceLoader::CancelWithError(int error_code) { } void ResourceLoader::ReportUploadProgress() { - ResourceRequestInfoImpl* info = GetRequestInfo(); - if (waiting_for_upload_progress_ack_) return; // Send one progress event at a time. @@ -152,8 +149,7 @@ void ResourceLoader::ReportUploadProgress() { if (is_finished || enough_new_progress || too_much_time_passed) { if (request_->load_flags() & net::LOAD_ENABLE_UPLOAD_PROGRESS) { - handler_->OnUploadProgress( - info->GetRequestID(), progress.position(), progress.size()); + handler_->OnUploadProgress(progress.position(), progress.size()); waiting_for_upload_progress_ack_ = true; } last_upload_ticks_ = TimeTicks::Now(); @@ -227,8 +223,7 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused, scoped_refptr<ResourceResponse> response(new ResourceResponse()); PopulateResourceResponse(request_.get(), response.get()); - if (!handler_->OnRequestRedirected( - info->GetRequestID(), new_url, response.get(), defer)) { + if (!handler_->OnRequestRedirected(new_url, response.get(), defer)) { Cancel(); } else if (*defer) { deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed. @@ -299,8 +294,7 @@ void ResourceLoader::OnBeforeNetworkStart(net::URLRequest* unused, DCHECK_EQ(request_.get(), unused); // Give the handler a chance to delay the URLRequest from using the network. - if (!handler_->OnBeforeNetworkStart( - GetRequestInfo()->GetRequestID(), request_->url(), defer)) { + if (!handler_->OnBeforeNetworkStart(request_->url(), defer)) { Cancel(); return; } else if (*defer) { @@ -554,8 +548,7 @@ void ResourceLoader::CompleteResponseStarted() { delegate_->DidReceiveResponse(this); bool defer = false; - if (!handler_->OnResponseStarted( - info->GetRequestID(), response.get(), &defer)) { + if (!handler_->OnResponseStarted(response.get(), &defer)) { Cancel(); } else if (defer) { read_deferral_start_time_ = base::TimeTicks::Now(); @@ -601,7 +594,6 @@ void ResourceLoader::ResumeReading() { } void ResourceLoader::ReadMore(int* bytes_read) { - ResourceRequestInfoImpl* info = GetRequestInfo(); DCHECK(!is_deferred()); // Make sure we track the buffer in at least one place. This ensures it gets @@ -609,7 +601,7 @@ void ResourceLoader::ReadMore(int* bytes_read) { // doesn't use the buffer. scoped_refptr<net::IOBuffer> buf; int buf_size; - if (!handler_->OnWillRead(info->GetRequestID(), &buf, &buf_size, -1)) { + if (!handler_->OnWillRead(&buf, &buf_size, -1)) { Cancel(); return; } @@ -627,10 +619,8 @@ void ResourceLoader::CompleteRead(int bytes_read) { DCHECK(bytes_read >= 0); DCHECK(request_->status().is_success()); - ResourceRequestInfoImpl* info = GetRequestInfo(); - bool defer = false; - if (!handler_->OnReadCompleted(info->GetRequestID(), bytes_read, &defer)) { + if (!handler_->OnReadCompleted(bytes_read, &defer)) { Cancel(); } else if (defer) { deferred_stage_ = @@ -664,8 +654,7 @@ void ResourceLoader::ResponseCompleted() { } bool defer = false; - handler_->OnResponseCompleted(info->GetRequestID(), request_->status(), - security_info, &defer); + handler_->OnResponseCompleted(request_->status(), security_info, &defer); if (defer) { // The handler is not ready to die yet. We will call DidFinishLoading when // we resume. |