| 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 1705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1716 } | 1716 } |
| 1717 callback.Run(bitmap); | 1717 callback.Run(bitmap); |
| 1718 return; | 1718 return; |
| 1719 } | 1719 } |
| 1720 | 1720 |
| 1721 callback.Run(drag_image_.getSkBitmap()); | 1721 callback.Run(drag_image_.getSkBitmap()); |
| 1722 return; | 1722 return; |
| 1723 } | 1723 } |
| 1724 | 1724 |
| 1725 test_runner::DumpPixelsAsync(web_view, layout_test_runtime_flags_, | 1725 test_runner::DumpPixelsAsync(web_view, layout_test_runtime_flags_, |
| 1726 delegate_->GetDeviceScaleFactorForTest(), | 1726 delegate_->GetDeviceScaleFactor(), callback); |
| 1727 callback); | |
| 1728 } | 1727 } |
| 1729 | 1728 |
| 1730 void TestRunner::ReplicateLayoutTestRuntimeFlagsChanges( | 1729 void TestRunner::ReplicateLayoutTestRuntimeFlagsChanges( |
| 1731 const base::DictionaryValue& changed_values) { | 1730 const base::DictionaryValue& changed_values) { |
| 1732 if (test_is_running_) | 1731 if (test_is_running_) |
| 1733 layout_test_runtime_flags_.tracked_dictionary().ApplyUntrackedChanges( | 1732 layout_test_runtime_flags_.tracked_dictionary().ApplyUntrackedChanges( |
| 1734 changed_values); | 1733 changed_values); |
| 1735 } | 1734 } |
| 1736 | 1735 |
| 1737 bool TestRunner::HasCustomTextDump(std::string* custom_text_dump) const { | 1736 bool TestRunner::HasCustomTextDump(std::string* custom_text_dump) const { |
| (...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2734 | 2733 |
| 2735 void TestRunner::NotifyDone() { | 2734 void TestRunner::NotifyDone() { |
| 2736 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2735 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
| 2737 work_queue_.is_empty()) | 2736 work_queue_.is_empty()) |
| 2738 delegate_->TestFinished(); | 2737 delegate_->TestFinished(); |
| 2739 layout_test_runtime_flags_.set_wait_until_done(false); | 2738 layout_test_runtime_flags_.set_wait_until_done(false); |
| 2740 OnLayoutTestRuntimeFlagsChanged(); | 2739 OnLayoutTestRuntimeFlagsChanged(); |
| 2741 } | 2740 } |
| 2742 | 2741 |
| 2743 } // namespace test_runner | 2742 } // namespace test_runner |
| OLD | NEW |