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

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: -Release 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/global_request_id.h" 20 #include "content/public/browser/global_request_id.h"
20 #include "content/public/browser/resource_dispatcher_host_delegate.h" 21 #include "content/public/browser/resource_dispatcher_host_delegate.h"
21 #include "content/public/common/resource_response.h" 22 #include "content/public/common/resource_response.h"
22 #include "mojo/public/c/system/data_pipe.h" 23 #include "mojo/public/c/system/data_pipe.h"
23 #include "mojo/public/cpp/system/data_pipe.h" 24 #include "mojo/public/cpp/system/data_pipe.h"
24 #include "net/base/io_buffer.h" 25 #include "net/base/io_buffer.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 if (rdh_->delegate()) { 139 if (rdh_->delegate()) {
139 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(), 140 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(),
140 response); 141 response);
141 } 142 }
142 143
143 NetLogObserver::PopulateResponseInfo(request(), response); 144 NetLogObserver::PopulateResponseInfo(request(), response);
144 145
145 response->head.request_start = request()->creation_time(); 146 response->head.request_start = request()->creation_time();
146 response->head.response_start = base::TimeTicks::Now(); 147 response->head.response_start = base::TimeTicks::Now();
147 sent_received_response_message_ = true; 148 sent_received_response_message_ = true;
148 url_loader_client_->OnReceiveResponse(response->head); 149
150 mojom::DownloadedTempFilePtr downloaded_file_ptr;
151 if (!response->head.download_file_path.empty()) {
152 auto downloaded_file = base::MakeUnique<DownloadedTempFileImpl>(
153 rdh_, info->GetChildID(), info->GetRequestID(),
154 response->head.download_file_path);
155 downloaded_file_ptr = downloaded_file->CreateInterfacePtrAndBind();
156 rdh_->RegisterDownloadedTempFile(std::move(downloaded_file));
157 }
158
159 url_loader_client_->OnReceiveResponse(response->head,
160 std::move(downloaded_file_ptr));
149 return true; 161 return true;
150 } 162 }
151 163
152 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) { 164 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) {
153 return true; 165 return true;
154 } 166 }
155 167
156 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, 168 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
157 int* buf_size, 169 int* buf_size,
158 int min_size) { 170 int min_size) {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 Resume(); 413 Resume();
402 } 414 }
403 415
404 void MojoAsyncResourceHandler::Cancel() { 416 void MojoAsyncResourceHandler::Cancel() {
405 const ResourceRequestInfoImpl* info = GetRequestInfo(); 417 const ResourceRequestInfoImpl* info = GetRequestInfo();
406 ResourceDispatcherHostImpl::Get()->CancelRequestFromRenderer( 418 ResourceDispatcherHostImpl::Get()->CancelRequestFromRenderer(
407 GlobalRequestID(info->GetChildID(), info->GetRequestID())); 419 GlobalRequestID(info->GetChildID(), info->GetRequestID()));
408 } 420 }
409 421
410 } // namespace content 422 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698