Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/test_runner/test_runner.h" | 5 #include "components/test_runner/test_runner.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1921 bool Run(WebTestDelegate* delegate, WebView*) override { | 1921 bool Run(WebTestDelegate* delegate, WebView*) override { |
| 1922 delegate->GoToOffset(distance_); | 1922 delegate->GoToOffset(distance_); |
| 1923 return true; // FIXME: Did it really start a navigation? | 1923 return true; // FIXME: Did it really start a navigation? |
| 1924 } | 1924 } |
| 1925 | 1925 |
| 1926 private: | 1926 private: |
| 1927 int distance_; | 1927 int distance_; |
| 1928 }; | 1928 }; |
| 1929 | 1929 |
| 1930 void TestRunner::NotifyDone() { | 1930 void TestRunner::NotifyDone() { |
| 1931 // Test didn't timeout. Kill the pending callbacks. | |
| 1932 weak_factory_.InvalidateWeakPtrs(); | |
|
Łukasz Anforowicz
2016/05/19 23:01:16
If I don't remove this, then calling testRunner.no
| |
| 1933 | |
| 1934 CompleteNotifyDone(); | 1931 CompleteNotifyDone(); |
| 1935 } | 1932 } |
| 1936 | 1933 |
| 1937 void TestRunner::WaitUntilDone() { | 1934 void TestRunner::WaitUntilDone() { |
| 1938 layout_test_runtime_flags_.set_wait_until_done(true); | 1935 layout_test_runtime_flags_.set_wait_until_done(true); |
| 1939 OnLayoutTestRuntimeFlagsChanged(); | 1936 OnLayoutTestRuntimeFlagsChanged(); |
| 1940 } | 1937 } |
| 1941 | 1938 |
| 1942 void TestRunner::QueueBackNavigation(int how_far_back) { | 1939 void TestRunner::QueueBackNavigation(int how_far_back) { |
| 1943 work_queue_.AddWork(new WorkItemBackForward(-how_far_back)); | 1940 work_queue_.AddWork(new WorkItemBackForward(-how_far_back)); |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2718 | 2715 |
| 2719 void TestRunner::CompleteNotifyDone() { | 2716 void TestRunner::CompleteNotifyDone() { |
| 2720 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2717 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
| 2721 work_queue_.is_empty()) | 2718 work_queue_.is_empty()) |
| 2722 delegate_->TestFinished(); | 2719 delegate_->TestFinished(); |
| 2723 layout_test_runtime_flags_.set_wait_until_done(false); | 2720 layout_test_runtime_flags_.set_wait_until_done(false); |
| 2724 OnLayoutTestRuntimeFlagsChanged(); | 2721 OnLayoutTestRuntimeFlagsChanged(); |
| 2725 } | 2722 } |
| 2726 | 2723 |
| 2727 } // namespace test_runner | 2724 } // namespace test_runner |
| OLD | NEW |