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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 185993008: Moving DidFinishLoad from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for failing SitePerProcessNavigation test. Created 6 years, 10 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5ede1bc021e25c93b4ed926898a930ff43e62948..f5f1d2d3a314a7457d05c47b11822b5f3b4cddf5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1556,11 +1556,26 @@ void RenderFrameImpl::didFailLoad(blink::WebFrame* frame,
void RenderFrameImpl::didFinishLoad(blink::WebFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
- // TODO(nasko): Move implementation here. No state needed, just observers
- // notification before sending message to the browser process.
+ WebDataSource* ds = frame->dataSource();
+ DocumentState* document_state = DocumentState::FromDataSource(ds);
+ if (document_state->finish_load_time().is_null()) {
+ if (!frame->parent()) {
+ TRACE_EVENT_INSTANT0("WebCore", "LoadFinished",
+ TRACE_EVENT_SCOPE_PROCESS);
+ }
+ document_state->set_finish_load_time(Time::Now());
+ }
+
render_view_->didFinishLoad(frame);
- FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
- DidFinishLoad());
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidFinishLoad());
+
+ // Don't send this message while the frame is swapped out.
+ if (is_swapped_out())
+ return;
+
+ Send(new FrameHostMsg_DidFinishLoad(routing_id_,
+ ds->request().url(),
Charlie Reis 2014/03/05 18:50:26 nit: 1 more space indent.
nasko 2014/03/05 19:00:46 Done.
+ !frame->parent()));
}
void RenderFrameImpl::didNavigateWithinPage(blink::WebFrame* frame,

Powered by Google App Engine
This is Rietveld 408576698