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

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

Issue 1073533002: OOPIF: Don't crash when running layout tests that have an OOP iframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/accessibility_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/layout_test/webkit_test_runner.cc
diff --git a/content/shell/renderer/layout_test/webkit_test_runner.cc b/content/shell/renderer/layout_test/webkit_test_runner.cc
index b33b290fab62d4ec46ff8d15ae53840ddd12553a..19bb93100008af3304b6bbba8d55513133011617 100644
--- a/content/shell/renderer/layout_test/webkit_test_runner.cc
+++ b/content/shell/renderer/layout_test/webkit_test_runner.cc
@@ -657,14 +657,17 @@ void WebKitTestRunner::Reset() {
current_entry_indexes_.clear();
render_view()->ClearEditCommands();
- render_view()->GetWebView()->mainFrame()->setName(WebString());
+ if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
+ render_view()->GetWebView()->mainFrame()->setName(WebString());
render_view()->GetWebView()->mainFrame()->clearOpener();
// Resetting the internals object also overrides the WebPreferences, so we
// have to sync them to WebKit again.
- WebTestingSupport::resetInternalsObject(
- render_view()->GetWebView()->mainFrame()->toWebLocalFrame());
- render_view()->SetWebkitPreferences(render_view()->GetWebkitPreferences());
+ if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) {
+ WebTestingSupport::resetInternalsObject(
+ render_view()->GetWebView()->mainFrame()->toWebLocalFrame());
+ render_view()->SetWebkitPreferences(render_view()->GetWebkitPreferences());
+ }
}
// Private methods -----------------------------------------------------------
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/accessibility_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698