Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "cc/surfaces/display_scheduler.h" | 5 #include "cc/surfaces/display_scheduler.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/test/null_task_runner.h" | 8 #include "base/test/null_task_runner.h" |
| 9 #include "base/test/simple_test_tick_clock.h" | 9 #include "base/test/simple_test_tick_clock.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 int draw_and_swap_count() const { return draw_and_swap_count_; } | 32 int draw_and_swap_count() const { return draw_and_swap_count_; } |
| 33 | 33 |
| 34 protected: | 34 protected: |
| 35 int draw_and_swap_count_; | 35 int draw_and_swap_count_; |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 class TestDisplayScheduler : public DisplayScheduler { | 38 class TestDisplayScheduler : public DisplayScheduler { |
| 39 public: | 39 public: |
| 40 TestDisplayScheduler(DisplaySchedulerClient* client, | 40 TestDisplayScheduler(DisplaySchedulerClient* client, |
| 41 BeginFrameSource* begin_frame_source, | 41 BeginFrameSource* begin_frame_source, |
| 42 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 42 base::NullTaskRunner* task_runner, |
|
mithro-old
2015/06/22 11:49:39
Why is this changing to a NullTaskRunner verses a
sunnyps
2015/06/22 20:32:41
No particular reason but I like keeping tests spec
| |
| 43 int max_pending_swaps) | 43 int max_pending_swaps) |
| 44 : DisplayScheduler(client, | 44 : DisplayScheduler(client, |
| 45 begin_frame_source, | 45 begin_frame_source, |
| 46 task_runner, | 46 task_runner, |
| 47 max_pending_swaps), | 47 max_pending_swaps), |
| 48 scheduler_begin_frame_deadline_count_(0) {} | 48 scheduler_begin_frame_deadline_count_(0) {} |
| 49 | 49 |
| 50 base::TimeTicks DesiredBeginFrameDeadlineTimeForTest() { | 50 base::TimeTicks DesiredBeginFrameDeadlineTimeForTest() { |
| 51 return DesiredBeginFrameDeadlineTime(); | 51 return DesiredBeginFrameDeadlineTime(); |
| 52 } | 52 } |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 68 | 68 |
| 69 class DisplaySchedulerTest : public testing::Test { | 69 class DisplaySchedulerTest : public testing::Test { |
| 70 public: | 70 public: |
| 71 DisplaySchedulerTest() : now_src_(new base::SimpleTestTickClock()) { | 71 DisplaySchedulerTest() : now_src_(new base::SimpleTestTickClock()) { |
| 72 const int max_pending_swaps = 1; | 72 const int max_pending_swaps = 1; |
| 73 now_src_->Advance(base::TimeDelta::FromMicroseconds(10000)); | 73 now_src_->Advance(base::TimeDelta::FromMicroseconds(10000)); |
| 74 null_task_runner_ = make_scoped_refptr(new base::NullTaskRunner); | 74 null_task_runner_ = make_scoped_refptr(new base::NullTaskRunner); |
| 75 client_ = make_scoped_ptr(new FakeDisplaySchedulerClient); | 75 client_ = make_scoped_ptr(new FakeDisplaySchedulerClient); |
| 76 scheduler_ = make_scoped_ptr( | 76 scheduler_ = make_scoped_ptr( |
| 77 new TestDisplayScheduler(client_.get(), &fake_begin_frame_source_, | 77 new TestDisplayScheduler(client_.get(), &fake_begin_frame_source_, |
| 78 null_task_runner_, max_pending_swaps)); | 78 null_task_runner_.get(), max_pending_swaps)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 ~DisplaySchedulerTest() override {} | 81 ~DisplaySchedulerTest() override {} |
| 82 | 82 |
| 83 void SetUp() override { scheduler_->SetRootSurfaceResourcesLocked(false); } | 83 void SetUp() override { scheduler_->SetRootSurfaceResourcesLocked(false); } |
| 84 | 84 |
| 85 void BeginFrameForTest() { | 85 void BeginFrameForTest() { |
| 86 base::TimeTicks frame_time = now_src_->NowTicks(); | 86 base::TimeTicks frame_time = now_src_->NowTicks(); |
| 87 base::TimeDelta interval = BeginFrameArgs::DefaultInterval(); | 87 base::TimeDelta interval = BeginFrameArgs::DefaultInterval(); |
| 88 base::TimeTicks deadline = frame_time + interval; | 88 base::TimeTicks deadline = frame_time + interval; |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 335 | 335 |
| 336 scheduler_->SetRootSurfaceResourcesLocked(true); | 336 scheduler_->SetRootSurfaceResourcesLocked(true); |
| 337 EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count()); | 337 EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count()); |
| 338 | 338 |
| 339 scheduler_->OutputSurfaceLost(); | 339 scheduler_->OutputSurfaceLost(); |
| 340 EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count()); | 340 EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count()); |
| 341 } | 341 } |
| 342 | 342 |
| 343 } // namespace | 343 } // namespace |
| 344 } // namespace cc | 344 } // namespace cc |
| OLD | NEW |