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

Side by Side Diff: chrome/renderer/prerender/prerender_helper.cc

Issue 8404018: chrome.loadTimes() shouldn't be affected by in-document navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix style Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/renderer/prerender/prerender_helper.h" 5 #include "chrome/renderer/prerender/prerender_helper.h"
6 6
7 #include "base/metrics/field_trial.h" 7 #include "base/metrics/field_trial.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "content/public/renderer/navigation_state.h" 10 #include "content/public/renderer/navigation_state.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // If this is the first provisional load since prerendering started, get its 125 // If this is the first provisional load since prerendering started, get its
126 // request time. 126 // request time.
127 if (is_prerendering_ && prerender_start_time_.is_null()) { 127 if (is_prerendering_ && prerender_start_time_.is_null()) {
128 WebKit::WebDataSource* data_source = frame->provisionalDataSource(); 128 WebKit::WebDataSource* data_source = frame->provisionalDataSource();
129 if (!data_source) { 129 if (!data_source) {
130 NOTREACHED(); 130 NOTREACHED();
131 return; 131 return;
132 } 132 }
133 NavigationState* navigation_state = 133 NavigationState* navigation_state =
134 NavigationState::FromDataSource(data_source); 134 NavigationState::FromDataSource(data_source);
135 prerender_start_time_ = navigation_state->request_time(); 135 prerender_start_time_ = navigation_state->load_times()->request_time();
136 // The first navigation for prerendering RenderViews can only be triggered 136 // The first navigation for prerendering RenderViews can only be triggered
137 // from PrerenderContents, so there should be a request_time. 137 // from PrerenderContents, so there should be a request_time.
138 DCHECK(!prerender_start_time_.is_null()); 138 DCHECK(!prerender_start_time_.is_null());
139 } 139 }
140 } 140 }
141 141
142 bool PrerenderHelper::OnMessageReceived( 142 bool PrerenderHelper::OnMessageReceived(
143 const IPC::Message& message) { 143 const IPC::Message& message) {
144 IPC_BEGIN_MESSAGE_MAP(PrerenderHelper, message) 144 IPC_BEGIN_MESSAGE_MAP(PrerenderHelper, message)
145 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsPrerendering, OnSetIsPrerendering) 145 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsPrerendering, OnSetIsPrerendering)
(...skipping 21 matching lines...) Expand all
167 } 167 }
168 168
169 void PrerenderHelper::UpdateVisibilityState() { 169 void PrerenderHelper::UpdateVisibilityState() {
170 if (render_view()->GetWebView()) { 170 if (render_view()->GetWebView()) {
171 render_view()->GetWebView()->setVisibilityState( 171 render_view()->GetWebView()->setVisibilityState(
172 render_view()->GetVisibilityState(), false); 172 render_view()->GetVisibilityState(), false);
173 } 173 }
174 } 174 }
175 175
176 } // namespace prerender 176 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698