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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/test/simple_test_tick_clock.h" | 9 #include "base/test/simple_test_tick_clock.h" |
10 #include "cc/layers/video_frame_provider.h" | 10 #include "cc/layers/video_frame_provider.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 ACTION_P(RunClosure, closure) { | 22 ACTION_P(RunClosure, closure) { |
23 closure.Run(); | 23 closure.Run(); |
24 } | 24 } |
25 | 25 |
26 class VideoFrameCompositorTest : public testing::Test, | 26 class VideoFrameCompositorTest : public testing::Test, |
27 public cc::VideoFrameProvider::Client, | 27 public cc::VideoFrameProvider::Client, |
28 public VideoRendererSink::RenderCallback { | 28 public VideoRendererSink::RenderCallback { |
29 public: | 29 public: |
30 VideoFrameCompositorTest() | 30 VideoFrameCompositorTest() |
31 : tick_clock_(new base::SimpleTestTickClock()), | 31 : tick_clock_(new base::SimpleTestTickClock(base::TimeTicks())), |
32 compositor_(new VideoFrameCompositor( | 32 compositor_(new VideoFrameCompositor( |
33 message_loop.task_runner(), | 33 message_loop.task_runner(), |
34 base::Bind(&VideoFrameCompositorTest::NaturalSizeChanged, | 34 base::Bind(&VideoFrameCompositorTest::NaturalSizeChanged, |
35 base::Unretained(this)), | 35 base::Unretained(this)), |
36 base::Bind(&VideoFrameCompositorTest::OpacityChanged, | 36 base::Bind(&VideoFrameCompositorTest::OpacityChanged, |
37 base::Unretained(this)))), | 37 base::Unretained(this)))), |
38 did_receive_frame_count_(0), | 38 did_receive_frame_count_(0), |
39 natural_size_changed_count_(0), | 39 natural_size_changed_count_(0), |
40 opacity_changed_count_(0), | 40 opacity_changed_count_(0), |
41 opaque_(false) { | 41 opaque_(false) { |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 | 426 |
427 // Advancing the tick clock should allow a new frame to be requested. | 427 // Advancing the tick clock should allow a new frame to be requested. |
428 tick_clock_->Advance(base::TimeDelta::FromMilliseconds(10)); | 428 tick_clock_->Advance(base::TimeDelta::FromMilliseconds(10)); |
429 ASSERT_EQ(opaque_frame_2, compositor()->GetCurrentFrameAndUpdateIfStale()); | 429 ASSERT_EQ(opaque_frame_2, compositor()->GetCurrentFrameAndUpdateIfStale()); |
430 | 430 |
431 // Background rendering should tick another render callback. | 431 // Background rendering should tick another render callback. |
432 StopVideoRendererSink(false); | 432 StopVideoRendererSink(false); |
433 } | 433 } |
434 | 434 |
435 } // namespace media | 435 } // namespace media |
OLD | NEW |