OLD | NEW |
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" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 request_.origin_pid = request_info.requestor_pid; | 122 request_.origin_pid = request_info.requestor_pid; |
123 request_.resource_type = request_info.request_type; | 123 request_.resource_type = request_info.request_type; |
124 request_.priority = request_info.priority; | 124 request_.priority = request_info.priority; |
125 request_.request_context = request_info.request_context; | 125 request_.request_context = request_info.request_context; |
126 request_.appcache_host_id = request_info.appcache_host_id; | 126 request_.appcache_host_id = request_info.appcache_host_id; |
127 request_.download_to_file = request_info.download_to_file; | 127 request_.download_to_file = request_info.download_to_file; |
128 request_.has_user_gesture = request_info.has_user_gesture; | 128 request_.has_user_gesture = request_info.has_user_gesture; |
129 if (request_info.extra_data) { | 129 if (request_info.extra_data) { |
130 RequestExtraData* extra_data = | 130 RequestExtraData* extra_data = |
131 static_cast<RequestExtraData*>(request_info.extra_data); | 131 static_cast<RequestExtraData*>(request_info.extra_data); |
| 132 request_.render_frame_id = extra_data->render_frame_id(); |
132 request_.is_main_frame = extra_data->is_main_frame(); | 133 request_.is_main_frame = extra_data->is_main_frame(); |
133 request_.frame_id = extra_data->frame_id(); | 134 request_.frame_id = extra_data->frame_id(); |
134 request_.parent_is_main_frame = extra_data->parent_is_main_frame(); | 135 request_.parent_is_main_frame = extra_data->parent_is_main_frame(); |
135 request_.parent_frame_id = extra_data->parent_frame_id(); | 136 request_.parent_frame_id = extra_data->parent_frame_id(); |
136 request_.allow_download = extra_data->allow_download(); | 137 request_.allow_download = extra_data->allow_download(); |
137 request_.transition_type = extra_data->transition_type(); | 138 request_.transition_type = extra_data->transition_type(); |
138 request_.should_replace_current_entry = | 139 request_.should_replace_current_entry = |
139 extra_data->should_replace_current_entry(); | 140 extra_data->should_replace_current_entry(); |
140 request_.transferred_request_child_id = | 141 request_.transferred_request_child_id = |
141 extra_data->transferred_request_child_id(); | 142 extra_data->transferred_request_child_id(); |
142 request_.transferred_request_request_id = | 143 request_.transferred_request_request_id = |
143 extra_data->transferred_request_request_id(); | 144 extra_data->transferred_request_request_id(); |
144 frame_origin_ = extra_data->frame_origin(); | 145 frame_origin_ = extra_data->frame_origin(); |
145 } else { | 146 } else { |
| 147 request_.render_frame_id = MSG_ROUTING_NONE; |
146 request_.is_main_frame = false; | 148 request_.is_main_frame = false; |
147 request_.frame_id = -1; | 149 request_.frame_id = -1; |
148 request_.parent_is_main_frame = false; | 150 request_.parent_is_main_frame = false; |
149 request_.parent_frame_id = -1; | 151 request_.parent_frame_id = -1; |
150 request_.allow_download = true; | 152 request_.allow_download = true; |
151 request_.transition_type = PAGE_TRANSITION_LINK; | 153 request_.transition_type = PAGE_TRANSITION_LINK; |
152 request_.should_replace_current_entry = false; | 154 request_.should_replace_current_entry = false; |
153 request_.transferred_request_child_id = -1; | 155 request_.transferred_request_child_id = -1; |
154 request_.transferred_request_request_id = -1; | 156 request_.transferred_request_request_id = -1; |
155 } | 157 } |
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
801 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) { | 803 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) { |
802 while (!queue->empty()) { | 804 while (!queue->empty()) { |
803 IPC::Message* message = queue->front(); | 805 IPC::Message* message = queue->front(); |
804 ReleaseResourcesInDataMessage(*message); | 806 ReleaseResourcesInDataMessage(*message); |
805 queue->pop_front(); | 807 queue->pop_front(); |
806 delete message; | 808 delete message; |
807 } | 809 } |
808 } | 810 } |
809 | 811 |
810 } // namespace content | 812 } // namespace content |
OLD | NEW |