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

Side by Side Diff: content/browser/loader/resource_request_info_impl.h

Issue 1079163008: PlzNavigate: provide the FrameTreeNode ID to the network stack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-unittests
Patch Set: Addressed David's comments Created 5 years, 7 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
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 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_ 5 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
6 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_ 6 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 25 matching lines...) Expand all
36 net::URLRequest* request); 36 net::URLRequest* request);
37 37
38 // And, a const version for cases where you only need read access. 38 // And, a const version for cases where you only need read access.
39 CONTENT_EXPORT static const ResourceRequestInfoImpl* ForRequest( 39 CONTENT_EXPORT static const ResourceRequestInfoImpl* ForRequest(
40 const net::URLRequest* request); 40 const net::URLRequest* request);
41 41
42 CONTENT_EXPORT ResourceRequestInfoImpl( 42 CONTENT_EXPORT ResourceRequestInfoImpl(
43 int process_type, 43 int process_type,
44 int child_id, 44 int child_id,
45 int route_id, 45 int route_id,
46 int64 frame_tree_node_id,
nasko 2015/05/22 16:48:07 int
clamy 2015/05/26 10:43:11 Done.
46 int origin_pid, 47 int origin_pid,
47 int request_id, 48 int request_id,
48 int render_frame_id, 49 int render_frame_id,
49 bool is_main_frame, 50 bool is_main_frame,
50 bool parent_is_main_frame, 51 bool parent_is_main_frame,
51 int parent_render_frame_id, 52 int parent_render_frame_id,
52 ResourceType resource_type, 53 ResourceType resource_type,
53 ui::PageTransition transition_type, 54 ui::PageTransition transition_type,
54 bool should_replace_current_entry, 55 bool should_replace_current_entry,
55 bool is_download, 56 bool is_download,
(...skipping 30 matching lines...) Expand all
86 bool GetAssociatedRenderFrame(int* render_process_id, 87 bool GetAssociatedRenderFrame(int* render_process_id,
87 int* render_frame_id) const override; 88 int* render_frame_id) const override;
88 bool IsAsync() const override; 89 bool IsAsync() const override;
89 bool IsDownload() const override; 90 bool IsDownload() const override;
90 91
91 CONTENT_EXPORT void AssociateWithRequest(net::URLRequest* request); 92 CONTENT_EXPORT void AssociateWithRequest(net::URLRequest* request);
92 93
93 CONTENT_EXPORT GlobalRequestID GetGlobalRequestID() const; 94 CONTENT_EXPORT GlobalRequestID GetGlobalRequestID() const;
94 GlobalRoutingID GetGlobalRoutingID() const; 95 GlobalRoutingID GetGlobalRoutingID() const;
95 96
97 // PlzNavigate
98 // The id of the FrameTreeNode that initiated this request (for a navigation
99 // request).
100 int64 frame_tree_node_id() const { return frame_tree_node_id_; }
101
96 // May be NULL (e.g., if process dies during a transfer). 102 // May be NULL (e.g., if process dies during a transfer).
97 ResourceMessageFilter* filter() const { 103 ResourceMessageFilter* filter() const {
98 return filter_.get(); 104 return filter_.get();
99 } 105 }
100 106
101 // Updates the data associated with this request after it is is transferred 107 // Updates the data associated with this request after it is is transferred
102 // to a new renderer process. Not all data will change during a transfer. 108 // to a new renderer process. Not all data will change during a transfer.
103 // We do not expect the ResourceContext to change during navigation, so that 109 // We do not expect the ResourceContext to change during navigation, so that
104 // does not need to be updated. 110 // does not need to be updated.
105 void UpdateForTransfer(int child_id, 111 void UpdateForTransfer(int child_id,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 DeletedFilterDetached); 184 DeletedFilterDetached);
179 FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest, 185 FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
180 DeletedFilterDetachedRedirect); 186 DeletedFilterDetachedRedirect);
181 // Non-owning, may be NULL. 187 // Non-owning, may be NULL.
182 CrossSiteResourceHandler* cross_site_handler_; 188 CrossSiteResourceHandler* cross_site_handler_;
183 DetachableResourceHandler* detachable_handler_; 189 DetachableResourceHandler* detachable_handler_;
184 190
185 int process_type_; 191 int process_type_;
186 int child_id_; 192 int child_id_;
187 int route_id_; 193 int route_id_;
194 const int64 frame_tree_node_id_;
188 int origin_pid_; 195 int origin_pid_;
189 int request_id_; 196 int request_id_;
190 int render_frame_id_; 197 int render_frame_id_;
191 bool is_main_frame_; 198 bool is_main_frame_;
192 bool parent_is_main_frame_; 199 bool parent_is_main_frame_;
193 int parent_render_frame_id_; 200 int parent_render_frame_id_;
194 bool should_replace_current_entry_; 201 bool should_replace_current_entry_;
195 bool is_download_; 202 bool is_download_;
196 bool is_stream_; 203 bool is_stream_;
197 bool allow_download_; 204 bool allow_download_;
(...skipping 13 matching lines...) Expand all
211 // exits during a transfer. 218 // exits during a transfer.
212 base::WeakPtr<ResourceMessageFilter> filter_; 219 base::WeakPtr<ResourceMessageFilter> filter_;
213 bool is_async_; 220 bool is_async_;
214 221
215 DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl); 222 DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl);
216 }; 223 };
217 224
218 } // namespace content 225 } // namespace content
219 226
220 #endif // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_ 227 #endif // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698