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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 498883002: Add/improve tracing in navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Charlie's review Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/cross_site_resource_handler.cc ('k') | content/browser/site_instance_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index cb382c1b2a3f8e32de83f61222349c8b7ba3a126..78d6ed92a67f102a801ef286f337c7506a5c6b8c 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -254,7 +254,8 @@ bool RenderViewHostImpl::CreateRenderView(
int proxy_route_id,
int32 max_page_id,
bool window_was_created_with_opener) {
- TRACE_EVENT0("renderer_host", "RenderViewHostImpl::CreateRenderView");
+ TRACE_EVENT0("renderer_host,navigation",
+ "RenderViewHostImpl::CreateRenderView");
DCHECK(!IsRenderViewLive()) << "Creating view twice";
// The process may (if we're sharing a process with another host that already
@@ -480,7 +481,7 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs(const GURL& url) {
}
void RenderViewHostImpl::Navigate(const FrameMsg_Navigate_Params& params) {
- TRACE_EVENT0("renderer_host", "RenderViewHostImpl::Navigate");
+ TRACE_EVENT0("renderer_host,navigation", "RenderViewHostImpl::Navigate");
delegate_->GetFrameTree()->GetMainFrame()->Navigate(params);
}
@@ -496,6 +497,8 @@ void RenderViewHostImpl::OnSwappedOut(bool timed_out) {
// Ignore spurious swap out ack.
if (!IsWaitingForUnloadACK())
return;
+
+ TRACE_EVENT0("navigation", "RenderViewHostImpl::OnSwappedOut");
unload_event_monitor_timeout_->Stop();
if (timed_out) {
base::ProcessHandle process_handle = GetProcess()->GetHandle();
@@ -532,6 +535,9 @@ void RenderViewHostImpl::OnSwappedOut(bool timed_out) {
"BrowserRenderProcessHost.ChildKillsUnresponsive", 1);
}
}
+ // This is going to be incorrect for subframes and will only hit if
+ // --site-per-process is specified.
+ TRACE_EVENT_ASYNC_END0("navigation", "RenderFrameHostImpl::SwapOut", this);
}
switch (rvh_state_) {
« no previous file with comments | « content/browser/loader/cross_site_resource_handler.cc ('k') | content/browser/site_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698