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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2782783002: Remove redundant WebLocalFrame* parameter from didFinishDocumentLoad (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 3866 matching lines...) Expand 10 before | Expand all | Expand 10 after
3877 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 3877 UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
3878 } 3878 }
3879 3879
3880 void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame, 3880 void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame,
3881 blink::WebIconURL::Type icon_type) { 3881 blink::WebIconURL::Type icon_type) {
3882 DCHECK_EQ(frame_, frame); 3882 DCHECK_EQ(frame_, frame);
3883 // TODO(nasko): Investigate wheather implementation should move here. 3883 // TODO(nasko): Investigate wheather implementation should move here.
3884 render_view_->didChangeIcon(frame, icon_type); 3884 render_view_->didChangeIcon(frame, icon_type);
3885 } 3885 }
3886 3886
3887 void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) { 3887 void RenderFrameImpl::didFinishDocumentLoad() {
3888 TRACE_EVENT1("navigation,benchmark,rail", 3888 TRACE_EVENT1("navigation,benchmark,rail",
3889 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_); 3889 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_);
3890 DCHECK_EQ(frame_, frame);
3891
3892 Send(new FrameHostMsg_DidFinishDocumentLoad(routing_id_)); 3890 Send(new FrameHostMsg_DidFinishDocumentLoad(routing_id_));
3893 3891
3894 for (auto& observer : render_view_->observers()) 3892 for (auto& observer : render_view_->observers())
3895 observer.DidFinishDocumentLoad(frame); 3893 observer.DidFinishDocumentLoad(frame_);
3896 for (auto& observer : observers_) 3894 for (auto& observer : observers_)
3897 observer.DidFinishDocumentLoad(); 3895 observer.DidFinishDocumentLoad();
3898 3896
3899 // Check whether we have new encoding name. 3897 // Check whether we have new encoding name.
3900 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 3898 UpdateEncoding(frame_, frame_->view()->pageEncoding().utf8());
3901 } 3899 }
3902 3900
3903 void RenderFrameImpl::runScriptsAtDocumentReady(blink::WebLocalFrame* frame, 3901 void RenderFrameImpl::runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
3904 bool document_is_empty) { 3902 bool document_is_empty) {
3905 DCHECK_EQ(frame_, frame); 3903 DCHECK_EQ(frame_, frame);
3906 base::WeakPtr<RenderFrameImpl> weak_self = weak_factory_.GetWeakPtr(); 3904 base::WeakPtr<RenderFrameImpl> weak_self = weak_factory_.GetWeakPtr();
3907 3905
3908 MojoBindingsController* mojo_bindings_controller = 3906 MojoBindingsController* mojo_bindings_controller =
3909 MojoBindingsController::Get(this); 3907 MojoBindingsController::Get(this);
3910 if (mojo_bindings_controller) 3908 if (mojo_bindings_controller)
(...skipping 3058 matching lines...) Expand 10 before | Expand all | Expand 10 after
6969 policy(info.defaultPolicy), 6967 policy(info.defaultPolicy),
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), 6968 replaces_current_history_item(info.replacesCurrentHistoryItem),
6971 history_navigation_in_new_child_frame( 6969 history_navigation_in_new_child_frame(
6972 info.isHistoryNavigationInNewChildFrame), 6970 info.isHistoryNavigationInNewChildFrame),
6973 client_redirect(info.isClientRedirect), 6971 client_redirect(info.isClientRedirect),
6974 cache_disabled(info.isCacheDisabled), 6972 cache_disabled(info.isCacheDisabled),
6975 form(info.form), 6973 form(info.form),
6976 source_location(info.sourceLocation) {} 6974 source_location(info.sourceLocation) {}
6977 6975
6978 } // namespace content 6976 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698