Chromium Code Reviews| Index: components/test_runner/test_runner.cc |
| diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc |
| index 6efead26dcdee548444ef686902cc0ce061f013c..bf56c17af97251a4ea58226e6dbf9293a803bf72 100644 |
| --- a/components/test_runner/test_runner.cc |
| +++ b/components/test_runner/test_runner.cc |
| @@ -1832,9 +1832,9 @@ void TestRunner::DumpPixelsAsync( |
| void TestRunner::ReplicateLayoutTestRuntimeFlagsChanges( |
| const base::DictionaryValue& changed_values) { |
| - DCHECK(test_is_running_); |
|
Łukasz Anforowicz
2016/04/25 23:19:58
This DCHECK was introduced by me mainly to state t
|
| - layout_test_runtime_flags_.tracked_dictionary().ApplyUntrackedChanges( |
| - changed_values); |
| + if (test_is_running_) |
| + layout_test_runtime_flags_.tracked_dictionary().ApplyUntrackedChanges( |
| + changed_values); |
| } |
| bool TestRunner::HasCustomTextDump(std::string* custom_text_dump) const { |
| @@ -1944,10 +1944,12 @@ void TestRunner::tryToSetTopLoadingFrame(WebFrame* frame) { |
| if (!isFramePartOfMainTestWindow(frame)) |
| return; |
| - if (top_loading_frame_) |
| + if (top_loading_frame_ || layout_test_runtime_flags_.have_top_loading_frame()) |
| return; |
| top_loading_frame_ = frame; |
| + layout_test_runtime_flags_.set_have_top_loading_frame(true); |
| + OnLayoutTestRuntimeFlagsChanged(); |
| } |
| void TestRunner::tryToClearTopLoadingFrame(WebFrame* frame) { |
| @@ -1958,6 +1960,10 @@ void TestRunner::tryToClearTopLoadingFrame(WebFrame* frame) { |
| return; |
| top_loading_frame_ = nullptr; |
| + DCHECK(layout_test_runtime_flags_.have_top_loading_frame()); |
| + layout_test_runtime_flags_.set_have_top_loading_frame(false); |
| + OnLayoutTestRuntimeFlagsChanged(); |
| + |
| LocationChangeDone(); |
| } |
| @@ -3125,6 +3131,8 @@ void TestRunnerForSpecificView::CapturePixelsAsyncThen( |
| void TestRunner::OnLayoutTestRuntimeFlagsChanged() { |
| if (layout_test_runtime_flags_.tracked_dictionary().changed_values().empty()) |
| return; |
| + if (!test_is_running_) |
| + return; |
| delegate_->OnLayoutTestRuntimeFlagsChanged( |
| layout_test_runtime_flags_.tracked_dictionary().changed_values()); |