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

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

Issue 2689483007: Tests of ctrl-click can't postMessage to opener - using custom text instead. (Closed)
Patch Set: Rebasing... Created 3 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/test_runner/test_interfaces.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 d7b66ad91fc2120330e118a5ce900ab22a249f1c..24b8b7083f25c40f862c7146a028e2a6dd00a242 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -602,8 +602,11 @@ void BlinkTestRunner::SetLocale(const std::string& locale) {
void BlinkTestRunner::OnLayoutTestRuntimeFlagsChanged(
const base::DictionaryValue& changed_values) {
// Ignore changes that happen before we got the initial, accumulated
- // layout flag changes in ShellViewMsg_ReplicateTestConfiguration.
- if (!is_main_window_)
+ // layout flag changes in either OnReplicateTestConfiguration or
+ // OnSetTestConfiguration.
+ test_runner::WebTestInterfaces* interfaces =
+ LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
+ if (!interfaces->TestIsRunning())
return;
RenderThread::Get()->Send(
@@ -611,14 +614,16 @@ void BlinkTestRunner::OnLayoutTestRuntimeFlagsChanged(
}
void BlinkTestRunner::TestFinished() {
+ test_runner::WebTestInterfaces* interfaces =
+ LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
+ interfaces->SetTestIsRunning(false);
+
if (!is_main_window_ || !render_view()->GetMainRenderFrame()) {
RenderThread::Get()->Send(
new LayoutTestHostMsg_TestFinishedInSecondaryRenderer());
return;
}
- test_runner::WebTestInterfaces* interfaces =
- LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
- interfaces->SetTestIsRunning(false);
+
if (interfaces->TestRunner()->ShouldDumpBackForwardList()) {
SyncNavigationStateVisitor visitor;
RenderView::ForEach(&visitor);
« no previous file with comments | « no previous file | content/shell/test_runner/test_interfaces.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698