| 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 <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1616 delete queue_.front(); | 1616 delete queue_.front(); |
| 1617 queue_.pop_front(); | 1617 queue_.pop_front(); |
| 1618 if (startedLoad) | 1618 if (startedLoad) |
| 1619 return; | 1619 return; |
| 1620 } | 1620 } |
| 1621 | 1621 |
| 1622 if (!controller_->wait_until_done_ && !controller_->topLoadingFrame()) | 1622 if (!controller_->wait_until_done_ && !controller_->topLoadingFrame()) |
| 1623 controller_->delegate_->TestFinished(); | 1623 controller_->delegate_->TestFinished(); |
| 1624 } | 1624 } |
| 1625 | 1625 |
| 1626 TestRunner::WorkQueue::WorkQueueTask::WorkQueueTask(WorkQueue* object) |
| 1627 : WebMethodTask<WorkQueue>(object) {} |
| 1628 |
| 1626 void TestRunner::WorkQueue::WorkQueueTask::RunIfValid() { | 1629 void TestRunner::WorkQueue::WorkQueueTask::RunIfValid() { |
| 1627 object_->ProcessWork(); | 1630 object_->ProcessWork(); |
| 1628 } | 1631 } |
| 1629 | 1632 |
| 1630 TestRunner::TestRunner(TestInterfaces* interfaces) | 1633 TestRunner::TestRunner(TestInterfaces* interfaces) |
| 1631 : test_is_running_(false), | 1634 : test_is_running_(false), |
| 1632 close_remaining_windows_(false), | 1635 close_remaining_windows_(false), |
| 1633 work_queue_(this), | 1636 work_queue_(this), |
| 1634 disable_notify_done_(false), | 1637 disable_notify_done_(false), |
| 1635 web_history_item_count_(0), | 1638 web_history_item_count_(0), |
| (...skipping 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3162 } | 3165 } |
| 3163 | 3166 |
| 3164 void TestRunner::DidLosePointerLockInternal() { | 3167 void TestRunner::DidLosePointerLockInternal() { |
| 3165 bool was_locked = pointer_locked_; | 3168 bool was_locked = pointer_locked_; |
| 3166 pointer_locked_ = false; | 3169 pointer_locked_ = false; |
| 3167 if (was_locked) | 3170 if (was_locked) |
| 3168 web_view_->didLosePointerLock(); | 3171 web_view_->didLosePointerLock(); |
| 3169 } | 3172 } |
| 3170 | 3173 |
| 3171 } // namespace test_runner | 3174 } // namespace test_runner |
| OLD | NEW |