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

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

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/exported/WebRemoteFrameImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 91d0cfabf41e7a21ad60a2a91e08073ea9e48030..a798e7071d9f11c4a42e92e834c7d14b7691bb30 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -1027,7 +1027,10 @@ void BlinkTestRunner::OnReset() {
// 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);
+ if (render_view()->GetWebView()->MainFrame()->IsWebLocalFrame()) {
dcheng 2017/06/16 23:54:13 Hmm... seems racy for OOPIFs then... about:blank c
Łukasz Anforowicz 2017/06/19 22:30:42 I looked closer and it seems that the ShellViewMsg
+ render_view()->GetWebView()->MainFrame()->ToWebLocalFrame()->LoadRequest(
+ request);
+ }
Send(new ShellViewHostMsg_ResetDone(routing_id()));
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/exported/WebRemoteFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698