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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2782063003: Remove redundant WebLocalFrame* parameter from runScriptsAtDocumentReady (Closed)
Patch Set: Created 3 years, 9 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/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 679773f82aca83ced3397903a82c2e4dd7c899e6..1ff3222294dd5374af3800b72836ba7129154d7e 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3900,9 +3900,7 @@ void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) {
UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
}
-void RenderFrameImpl::runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
- bool document_is_empty) {
- DCHECK_EQ(frame_, frame);
+void RenderFrameImpl::runScriptsAtDocumentReady(bool document_is_empty) {
base::WeakPtr<RenderFrameImpl> weak_self = weak_factory_.GetWeakPtr();
MojoBindingsController* mojo_bindings_controller =
@@ -3915,7 +3913,7 @@ void RenderFrameImpl::runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
GetContentClient()->renderer()->RunScriptsAtDocumentEnd(this);
- // ContentClient might have deleted |frame| and |this| by now!
+ // ContentClient might have deleted |frame_| and |this| by now!
if (!weak_self.get())
return;
@@ -3933,19 +3931,19 @@ void RenderFrameImpl::runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
// Display error page instead of a blank page, if appropriate.
std::string error_domain = "http";
InternalDocumentStateData* internal_data =
- InternalDocumentStateData::FromDataSource(frame->dataSource());
+ InternalDocumentStateData::FromDataSource(frame_->dataSource());
int http_status_code = internal_data->http_status_code();
if (GetContentClient()->renderer()->HasErrorPage(http_status_code,
&error_domain)) {
WebURLError error;
- error.unreachableURL = frame->document().url();
+ error.unreachableURL = frame_->document().url();
error.domain = WebString::fromUTF8(error_domain);
error.reason = http_status_code;
// This call may run scripts, e.g. via the beforeunload event.
- LoadNavigationErrorPage(frame->dataSource()->getRequest(), error, true,
+ LoadNavigationErrorPage(frame_->dataSource()->getRequest(), error, true,
nullptr);
}
- // Do not use |this| or |frame| here without checking |weak_self|.
+ // Do not use |this| or |frame_| here without checking |weak_self|.
}
void RenderFrameImpl::runScriptsAtDocumentIdle(blink::WebLocalFrame* frame) {
« 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