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

Side by Side Diff: content/browser/frame_host/navigation_request.h

Issue 2846983002: Add more navigation tracing to RenderFrameHost and NavigationRequest. (Closed)
Patch Set: Move SetWaitingForRendererResponse implementation to .cc file. Created 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_NAVIGATION_REQUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 RestoreType restore_type() const { return restore_type_; }; 127 RestoreType restore_type() const { return restore_type_; };
128 128
129 bool is_view_source() const { return is_view_source_; }; 129 bool is_view_source() const { return is_view_source_; };
130 130
131 int bindings() const { return bindings_; }; 131 int bindings() const { return bindings_; };
132 132
133 bool browser_initiated() const { return browser_initiated_ ; } 133 bool browser_initiated() const { return browser_initiated_ ; }
134 134
135 bool may_transfer() const { return may_transfer_; } 135 bool may_transfer() const { return may_transfer_; }
136 136
137 void SetWaitingForRendererResponse() {
138 DCHECK(state_ == NOT_STARTED);
139 state_ = WAITING_FOR_RENDERER_RESPONSE;
140 }
141
142 AssociatedSiteInstanceType associated_site_instance_type() const { 137 AssociatedSiteInstanceType associated_site_instance_type() const {
143 return associated_site_instance_type_; 138 return associated_site_instance_type_;
144 } 139 }
145 void set_associated_site_instance_type(AssociatedSiteInstanceType type) { 140 void set_associated_site_instance_type(AssociatedSiteInstanceType type) {
clamy 2017/04/28 14:07:15 I'm wondering if we should also trace this, possib
nasko 2017/04/28 14:18:56 Sure. I'll try to add this.
nasko 2017/04/28 15:58:56 I looked at this and it seems more appropriate to
146 associated_site_instance_type_ = type; 141 associated_site_instance_type_ = type;
147 } 142 }
148 143
149 NavigationHandleImpl* navigation_handle() const { 144 NavigationHandleImpl* navigation_handle() const {
150 return navigation_handle_.get(); 145 return navigation_handle_.get();
151 } 146 }
152 147
148 void SetWaitingForRendererResponse();
149
153 // Creates a NavigationHandle. This should be called after any previous 150 // Creates a NavigationHandle. This should be called after any previous
154 // NavigationRequest for the FrameTreeNode has been destroyed. 151 // NavigationRequest for the FrameTreeNode has been destroyed.
155 void CreateNavigationHandle(int pending_nav_entry_id); 152 void CreateNavigationHandle(int pending_nav_entry_id);
156 153
157 // Transfers the ownership of the NavigationHandle to |render_frame_host|. 154 // Transfers the ownership of the NavigationHandle to |render_frame_host|.
158 // This should be called when the navigation is ready to commit, because the 155 // This should be called when the navigation is ready to commit, because the
159 // NavigationHandle outlives the NavigationRequest. The NavigationHandle's 156 // NavigationHandle outlives the NavigationRequest. The NavigationHandle's
160 // lifetime is the entire navigation, while the NavigationRequest is 157 // lifetime is the entire navigation, while the NavigationRequest is
161 // destroyed when a navigation is ready for commit. 158 // destroyed when a navigation is ready for commit.
162 void TransferNavigationHandleOwnership( 159 void TransferNavigationHandleOwnership(
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 mojo::ScopedDataPipeConsumerHandle handle_; 255 mojo::ScopedDataPipeConsumerHandle handle_;
259 256
260 base::Closure on_start_checks_complete_closure_; 257 base::Closure on_start_checks_complete_closure_;
261 258
262 DISALLOW_COPY_AND_ASSIGN(NavigationRequest); 259 DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
263 }; 260 };
264 261
265 } // namespace content 262 } // namespace content
266 263
267 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 264 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_request.cc » ('j') | content/browser/frame_host/navigation_request.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698