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

Unified Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Fixing build problems introduced by rebasing... Created 3 years, 6 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/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 2058533116f521116dba5d940b874f259d1c2b31..09c91b67a66ea057195c38a7fef7b219d18e50c6 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -1022,12 +1022,16 @@ void BlinkTestRunner::OnSessionHistory(
}
void BlinkTestRunner::OnReset() {
+ // ShellViewMsg_Reset should always be sent to the *current* view.
+ DCHECK(render_view()->GetWebView()->MainFrame()->IsWebLocalFrame());
+ WebLocalFrame* main_frame =
+ render_view()->GetWebView()->MainFrame()->ToWebLocalFrame();
+
LayoutTestRenderThreadObserver::GetInstance()->test_interfaces()->ResetAll();
Reset(true /* for_new_test */);
// Navigating to about:blank will make sure that no new loads are initiated
// by the renderer.
- WebURLRequest request = WebURLRequest(GURL(url::kAboutBlankURL));
- render_view()->GetWebView()->MainFrame()->LoadRequest(request);
+ main_frame->LoadRequest(WebURLRequest(GURL(url::kAboutBlankURL)));
Send(new ShellViewHostMsg_ResetDone(routing_id()));
}

Powered by Google App Engine
This is Rietveld 408576698