Remove redundant WebLocalFrame* parameter from didFinishLoad
Remove redundant WebLocalFrame* parameter from didFinishLoad in
WebFrameClient.
BUG=361765
Review-Url: https://codereview.chromium.org/2793503002
Cr-Commit-Position: refs/heads/master@{#465186}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 425e39bb..c3e311a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4007,21 +4007,20 @@
error.was_ignored_by_handler));
}
-void RenderFrameImpl::DidFinishLoad(blink::WebLocalFrame* frame) {
+void RenderFrameImpl::DidFinishLoad() {
TRACE_EVENT1("navigation,benchmark,rail",
"RenderFrameImpl::didFinishLoad", "id", routing_id_);
- DCHECK_EQ(frame_, frame);
- if (!frame->Parent()) {
+ if (!frame_->Parent()) {
TRACE_EVENT_INSTANT0("WebCore,benchmark,rail", "LoadFinished",
TRACE_EVENT_SCOPE_PROCESS);
}
for (auto& observer : render_view_->observers())
- observer.DidFinishLoad(frame);
+ observer.DidFinishLoad(frame_);
for (auto& observer : observers_)
observer.DidFinishLoad();
- WebDataSource* ds = frame->DataSource();
+ WebDataSource* ds = frame_->DataSource();
Send(new FrameHostMsg_DidFinishLoad(routing_id_, ds->GetRequest().Url()));
if (RenderThreadImpl::current()) {
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 726ecaa6..94d1ed7 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -582,7 +582,7 @@
void DidHandleOnloadEvents() override;
void DidFailLoad(const blink::WebURLError& error,
blink::WebHistoryCommitType commit_type) override;
- void DidFinishLoad(blink::WebLocalFrame* frame) override;
+ void DidFinishLoad() override;
void DidNavigateWithinPage(const blink::WebHistoryItem& item,
blink::WebHistoryCommitType commit_type,
bool content_initiated) override;
diff --git a/content/shell/test_runner/web_frame_test_client.cc b/content/shell/test_runner/web_frame_test_client.cc
index 405ba0f..5effc91 100644
--- a/content/shell/test_runner/web_frame_test_client.cc
+++ b/content/shell/test_runner/web_frame_test_client.cc
@@ -509,10 +509,9 @@
}
}
-void WebFrameTestClient::DidFinishLoad(blink::WebLocalFrame* frame) {
- DCHECK_EQ(frame, web_frame_test_proxy_base_->web_frame());
+void WebFrameTestClient::DidFinishLoad() {
if (test_runner()->shouldDumpFrameLoadCallbacks()) {
- PrintFrameDescription(delegate_, frame);
+ PrintFrameDescription(delegate_, web_frame_test_proxy_base_->web_frame());
delegate_->PrintMessage(" - didFinishLoadForFrame\n");
}
}
diff --git a/content/shell/test_runner/web_frame_test_client.h b/content/shell/test_runner/web_frame_test_client.h
index 7af580e2..7aeeebf 100644
--- a/content/shell/test_runner/web_frame_test_client.h
+++ b/content/shell/test_runner/web_frame_test_client.h
@@ -79,7 +79,7 @@
void DidHandleOnloadEvents() override;
void DidFailLoad(const blink::WebURLError& error,
blink::WebHistoryCommitType commit_type) override;
- void DidFinishLoad(blink::WebLocalFrame* frame) override;
+ void DidFinishLoad() override;
void DidNavigateWithinPage(const blink::WebHistoryItem& history_item,
blink::WebHistoryCommitType commit_type,
bool contentInitiated) override;
diff --git a/content/shell/test_runner/web_frame_test_proxy.h b/content/shell/test_runner/web_frame_test_proxy.h
index 83814677..ff9bef4 100644
--- a/content/shell/test_runner/web_frame_test_proxy.h
+++ b/content/shell/test_runner/web_frame_test_proxy.h
@@ -155,9 +155,9 @@
Base::DidFailLoad(error, commit_type);
}
- void DidFinishLoad(blink::WebLocalFrame* frame) override {
- Base::DidFinishLoad(frame);
- test_client()->DidFinishLoad(frame);
+ void DidFinishLoad() override {
+ Base::DidFinishLoad();
+ test_client()->DidFinishLoad();
}
void DidNavigateWithinPage(const blink::WebHistoryItem& history_item,
