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

Side by Side Diff: content/child/resource_dispatcher.cc

Issue 184343014: Add service_worker_provider_id param to ResourceHostMsg_Request. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/common/resource_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/memory/shared_memory.h" 14 #include "base/memory/shared_memory.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "content/child/request_extra_data.h" 18 #include "content/child/request_extra_data.h"
19 #include "content/child/site_isolation_policy.h" 19 #include "content/child/site_isolation_policy.h"
20 #include "content/common/inter_process_time_ticks_converter.h" 20 #include "content/common/inter_process_time_ticks_converter.h"
21 #include "content/common/resource_messages.h" 21 #include "content/common/resource_messages.h"
22 #include "content/common/service_worker/service_worker_types.h"
22 #include "content/public/child/resource_dispatcher_delegate.h" 23 #include "content/public/child/resource_dispatcher_delegate.h"
23 #include "content/public/common/resource_response.h" 24 #include "content/public/common/resource_response.h"
24 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
25 #include "net/base/net_util.h" 26 #include "net/base/net_util.h"
26 #include "net/base/request_priority.h" 27 #include "net/base/request_priority.h"
27 #include "net/http/http_response_headers.h" 28 #include "net/http/http_response_headers.h"
28 #include "webkit/common/resource_type.h" 29 #include "webkit/common/resource_type.h"
29 30
30 using webkit_glue::ResourceLoaderBridge; 31 using webkit_glue::ResourceLoaderBridge;
31 using webkit_glue::ResourceRequestBody; 32 using webkit_glue::ResourceRequestBody;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 request_.parent_is_main_frame = extra_data->parent_is_main_frame(); 136 request_.parent_is_main_frame = extra_data->parent_is_main_frame();
136 request_.parent_render_frame_id = extra_data->parent_render_frame_id(); 137 request_.parent_render_frame_id = extra_data->parent_render_frame_id();
137 request_.allow_download = extra_data->allow_download(); 138 request_.allow_download = extra_data->allow_download();
138 request_.transition_type = extra_data->transition_type(); 139 request_.transition_type = extra_data->transition_type();
139 request_.should_replace_current_entry = 140 request_.should_replace_current_entry =
140 extra_data->should_replace_current_entry(); 141 extra_data->should_replace_current_entry();
141 request_.transferred_request_child_id = 142 request_.transferred_request_child_id =
142 extra_data->transferred_request_child_id(); 143 extra_data->transferred_request_child_id();
143 request_.transferred_request_request_id = 144 request_.transferred_request_request_id =
144 extra_data->transferred_request_request_id(); 145 extra_data->transferred_request_request_id();
146 request_.service_worker_provider_id =
147 extra_data->service_worker_provider_id();
145 frame_origin_ = extra_data->frame_origin(); 148 frame_origin_ = extra_data->frame_origin();
146 } else { 149 } else {
147 request_.visiblity_state = blink::WebPageVisibilityStateVisible; 150 request_.visiblity_state = blink::WebPageVisibilityStateVisible;
148 request_.render_frame_id = MSG_ROUTING_NONE; 151 request_.render_frame_id = MSG_ROUTING_NONE;
149 request_.is_main_frame = false; 152 request_.is_main_frame = false;
150 request_.parent_is_main_frame = false; 153 request_.parent_is_main_frame = false;
151 request_.parent_render_frame_id = -1; 154 request_.parent_render_frame_id = -1;
152 request_.allow_download = true; 155 request_.allow_download = true;
153 request_.transition_type = PAGE_TRANSITION_LINK; 156 request_.transition_type = PAGE_TRANSITION_LINK;
154 request_.should_replace_current_entry = false; 157 request_.should_replace_current_entry = false;
155 request_.transferred_request_child_id = -1; 158 request_.transferred_request_child_id = -1;
156 request_.transferred_request_request_id = -1; 159 request_.transferred_request_request_id = -1;
160 request_.service_worker_provider_id = kInvalidServiceWorkerProviderId;
157 } 161 }
158 } 162 }
159 163
160 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() { 164 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
161 // we remove our hook for the resource dispatcher only when going away, since 165 // we remove our hook for the resource dispatcher only when going away, since
162 // it doesn't keep track of whether we've force terminated the request 166 // it doesn't keep track of whether we've force terminated the request
163 if (request_id_ >= 0) { 167 if (request_id_ >= 0) {
164 // this operation may fail, as the dispatcher will have preemptively 168 // this operation may fail, as the dispatcher will have preemptively
165 // removed us when the renderer sends the ReceivedAllData message. 169 // removed us when the renderer sends the ReceivedAllData message.
166 dispatcher_->RemovePendingRequest(request_id_); 170 dispatcher_->RemovePendingRequest(request_id_);
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) { 811 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
808 while (!queue->empty()) { 812 while (!queue->empty()) {
809 IPC::Message* message = queue->front(); 813 IPC::Message* message = queue->front();
810 ReleaseResourcesInDataMessage(*message); 814 ReleaseResourcesInDataMessage(*message);
811 queue->pop_front(); 815 queue->pop_front();
812 delete message; 816 delete message;
813 } 817 }
814 } 818 }
815 819
816 } // namespace content 820 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/resource_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698