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

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

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 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 a2243f07d7063ea4b7cee691756932f110a91d50..a00060da9e29112b6e96886190c121238abb0c59 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -842,7 +842,7 @@ void BlinkTestRunner::DidFailProvisionalLoad(WebLocalFrame* frame,
// Public methods - -----------------------------------------------------------
-void BlinkTestRunner::Reset() {
+void BlinkTestRunner::Reset(bool for_new_test) {
// The proxy_ is always non-NULL, it is set right after construction.
proxy_->set_widget(render_view()->GetWebView());
proxy_->Reset();
@@ -852,9 +852,11 @@ void BlinkTestRunner::Reset() {
current_entry_indexes_.clear();
render_view()->ClearEditCommands();
- if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
- render_view()->GetWebView()->mainFrame()->setName(WebString());
- render_view()->GetWebView()->mainFrame()->clearOpener();
+ if (for_new_test) {
+ 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.
@@ -1002,7 +1004,7 @@ void BlinkTestRunner::OnSessionHistory(
void BlinkTestRunner::OnReset() {
LayoutTestRenderProcessObserver::GetInstance()->test_interfaces()->ResetAll();
- Reset();
+ Reset(true /* for_new_test */);
// Navigating to about:blank will make sure that no new loads are initiated
// by the renderer.
render_view()->GetWebView()->mainFrame()->loadRequest(

Powered by Google App Engine
This is Rietveld 408576698