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

Side by Side Diff: content/browser/loader/mojo_async_resource_handler.cc

Issue 2503813002: Fix and refactor downloaded file handling in the loading stack (Closed)
Patch Set: revert an unrelated change Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/loader/mojo_async_resource_handler.h" 5 #include "content/browser/loader/mojo_async_resource_handler.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "content/browser/loader/downloaded_temp_file_impl.h"
15 #include "content/browser/loader/netlog_observer.h" 16 #include "content/browser/loader/netlog_observer.h"
16 #include "content/browser/loader/resource_dispatcher_host_impl.h" 17 #include "content/browser/loader/resource_dispatcher_host_impl.h"
17 #include "content/browser/loader/resource_request_info_impl.h" 18 #include "content/browser/loader/resource_request_info_impl.h"
18 #include "content/common/resource_request_completion_status.h" 19 #include "content/common/resource_request_completion_status.h"
19 #include "content/public/browser/resource_dispatcher_host_delegate.h" 20 #include "content/public/browser/resource_dispatcher_host_delegate.h"
20 #include "content/public/common/resource_response.h" 21 #include "content/public/common/resource_response.h"
21 #include "mojo/public/c/system/data_pipe.h" 22 #include "mojo/public/c/system/data_pipe.h"
22 #include "mojo/public/cpp/system/data_pipe.h" 23 #include "mojo/public/cpp/system/data_pipe.h"
23 #include "net/base/io_buffer.h" 24 #include "net/base/io_buffer.h"
24 #include "net/base/load_flags.h" 25 #include "net/base/load_flags.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 if (rdh_->delegate()) { 134 if (rdh_->delegate()) {
134 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(), 135 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(),
135 response); 136 response);
136 } 137 }
137 138
138 NetLogObserver::PopulateResponseInfo(request(), response); 139 NetLogObserver::PopulateResponseInfo(request(), response);
139 140
140 response->head.request_start = request()->creation_time(); 141 response->head.request_start = request()->creation_time();
141 response->head.response_start = base::TimeTicks::Now(); 142 response->head.response_start = base::TimeTicks::Now();
142 sent_received_response_message_ = true; 143 sent_received_response_message_ = true;
143 url_loader_client_->OnReceiveResponse(response->head); 144
145 mojom::DownloadedTempFilePtr downloaded_file_ptr;
146 if (!response->head.download_file_path.empty()) {
147 auto downloaded_file = base::MakeUnique<DownloadedTempFileImpl>(
148 rdh_, info->GetChildID(), info->GetRequestID(),
149 response->head.download_file_path);
150 downloaded_file_ptr = downloaded_file->CreateInterfacePtrAndBind();
151 rdh_->RegisterDownloadedTempFile(std::move(downloaded_file));
152 }
153
154 url_loader_client_->OnReceiveResponse(response->head,
155 std::move(downloaded_file_ptr));
144 return true; 156 return true;
145 } 157 }
146 158
147 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) { 159 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) {
148 return true; 160 return true;
149 } 161 }
150 162
151 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, 163 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
152 int* buf_size, 164 int* buf_size,
153 int min_size) { 165 int min_size) {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 406
395 controller()->CancelWithError(net::ERR_INSUFFICIENT_RESOURCES); 407 controller()->CancelWithError(net::ERR_INSUFFICIENT_RESOURCES);
396 return false; 408 return false;
397 } 409 }
398 410
399 void MojoAsyncResourceHandler::OnWritable(MojoResult unused) { 411 void MojoAsyncResourceHandler::OnWritable(MojoResult unused) {
400 Resume(); 412 Resume();
401 } 413 }
402 414
403 } // namespace content 415 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698