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

Side by Side Diff: content/child/resource_dispatcher.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/child/resource_dispatcher.h" 7 #include "content/child/resource_dispatcher.h"
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 URLLoaderClientImpl(int request_id, 81 URLLoaderClientImpl(int request_id,
82 ResourceDispatcher* resource_dispatcher, 82 ResourceDispatcher* resource_dispatcher,
83 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 83 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
84 : binding_(this), 84 : binding_(this),
85 request_id_(request_id), 85 request_id_(request_id),
86 resource_dispatcher_(resource_dispatcher), 86 resource_dispatcher_(resource_dispatcher),
87 task_runner_(std::move(task_runner)) {} 87 task_runner_(std::move(task_runner)) {}
88 ~URLLoaderClientImpl() override { 88 ~URLLoaderClientImpl() override {
89 if (body_consumer_) 89 if (body_consumer_)
90 body_consumer_->Cancel(); 90 body_consumer_->Cancel();
91 if (downloaded_file_)
92 downloaded_file_->Release();
91 } 93 }
92 94
93 void OnReceiveResponse(const ResourceResponseHead& response_head) override { 95 void OnReceiveResponse(
96 const ResourceResponseHead& response_head,
97 mojom::DownloadedTempFilePtr downloaded_file) override {
94 has_received_response_ = true; 98 has_received_response_ = true;
95 if (body_consumer_) 99 if (body_consumer_)
96 body_consumer_->Start(task_runner_.get()); 100 body_consumer_->Start(task_runner_.get());
101 downloaded_file_ = std::move(downloaded_file);
97 resource_dispatcher_->OnMessageReceived( 102 resource_dispatcher_->OnMessageReceived(
98 ResourceMsg_ReceivedResponse(request_id_, response_head)); 103 ResourceMsg_ReceivedResponse(request_id_, response_head));
99 } 104 }
100 105
101 void OnDataDownloaded(int64_t data_len, int64_t encoded_data_len) override { 106 void OnDataDownloaded(int64_t data_len, int64_t encoded_data_len) override {
102 resource_dispatcher_->OnMessageReceived( 107 resource_dispatcher_->OnMessageReceived(
103 ResourceMsg_DataDownloaded(request_id_, data_len, encoded_data_len)); 108 ResourceMsg_DataDownloaded(request_id_, data_len, encoded_data_len));
104 } 109 }
105 110
106 void OnStartLoadingResponseBody( 111 void OnStartLoadingResponseBody(
(...skipping 15 matching lines...) Expand all
122 } 127 }
123 128
124 void Bind(mojom::URLLoaderClientAssociatedPtrInfo* client_ptr_info, 129 void Bind(mojom::URLLoaderClientAssociatedPtrInfo* client_ptr_info,
125 mojo::AssociatedGroup* associated_group) { 130 mojo::AssociatedGroup* associated_group) {
126 binding_.Bind(client_ptr_info, associated_group); 131 binding_.Bind(client_ptr_info, associated_group);
127 } 132 }
128 133
129 private: 134 private:
130 mojo::AssociatedBinding<mojom::URLLoaderClient> binding_; 135 mojo::AssociatedBinding<mojom::URLLoaderClient> binding_;
131 scoped_refptr<URLResponseBodyConsumer> body_consumer_; 136 scoped_refptr<URLResponseBodyConsumer> body_consumer_;
137 mojom::DownloadedTempFilePtr downloaded_file_;
132 const int request_id_; 138 const int request_id_;
133 bool has_received_response_ = false; 139 bool has_received_response_ = false;
134 ResourceDispatcher* const resource_dispatcher_; 140 ResourceDispatcher* const resource_dispatcher_;
135 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 141 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
136 }; 142 };
137 143
138 void CheckSchemeForReferrerPolicy(const ResourceRequest& request) { 144 void CheckSchemeForReferrerPolicy(const ResourceRequest& request) {
139 if ((request.referrer_policy == blink::WebReferrerPolicyDefault || 145 if ((request.referrer_policy == blink::WebReferrerPolicyDefault ||
140 request.referrer_policy == 146 request.referrer_policy ==
141 blink::WebReferrerPolicyNoReferrerWhenDowngrade) && 147 blink::WebReferrerPolicyNoReferrerWhenDowngrade) &&
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 delete message; 843 delete message;
838 } 844 }
839 } 845 }
840 846
841 void ResourceDispatcher::SetResourceSchedulingFilter( 847 void ResourceDispatcher::SetResourceSchedulingFilter(
842 scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) { 848 scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) {
843 resource_scheduling_filter_ = resource_scheduling_filter; 849 resource_scheduling_filter_ = resource_scheduling_filter;
844 } 850 }
845 851
846 } // namespace content 852 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698