| Index: cc/surfaces/surface_display_output_surface_unittest.cc
|
| diff --git a/cc/surfaces/surface_display_output_surface_unittest.cc b/cc/surfaces/surface_display_output_surface_unittest.cc
|
| index 44859b06bf6690ef0d37df45d0137ac9c6305ed3..81c2c6e190e63925fd8903d82e182fe16f101181 100644
|
| --- a/cc/surfaces/surface_display_output_surface_unittest.cc
|
| +++ b/cc/surfaces/surface_display_output_surface_unittest.cc
|
| @@ -27,7 +27,7 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
|
| SurfaceDisplayOutputSurfaceTest()
|
| : now_src_(new base::SimpleTestTickClock()),
|
| task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
|
| - begin_frame_source_(new BackToBackBeginFrameSource(task_runner_.get())),
|
| + begin_frame_source_(task_runner_.get()),
|
| allocator_(0),
|
| display_size_(1920, 1080),
|
| display_rect_(display_size_),
|
| @@ -39,17 +39,14 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
|
| display_output_surface_ = display_output_surface.get();
|
| display_output_surface_->set_max_frames_pending(2);
|
|
|
| - display_.reset(new Display(&surface_manager_, &bitmap_manager_,
|
| - &gpu_memory_buffer_manager_, renderer_settings_,
|
| - allocator_.id_namespace(), task_runner_.get(),
|
| - std::move(display_output_surface)));
|
| + display_.reset(new Display(
|
| + &surface_manager_, &bitmap_manager_, &gpu_memory_buffer_manager_,
|
| + renderer_settings_, allocator_.id_namespace(), task_runner_.get(),
|
| + &begin_frame_source_, std::move(display_output_surface)));
|
| delegated_output_surface_.reset(new SurfaceDisplayOutputSurface(
|
| &surface_manager_, &allocator_, display_.get(), context_provider_,
|
| nullptr));
|
|
|
| - // Set the Display's begin frame source like a real browser compositor
|
| - // output surface would.
|
| - display_->SetBeginFrameSource(begin_frame_source_.get());
|
| delegated_output_surface_->BindToClient(&delegated_output_surface_client_);
|
| display_->Resize(display_size_);
|
|
|
| @@ -85,7 +82,7 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
|
| protected:
|
| std::unique_ptr<base::SimpleTestTickClock> now_src_;
|
| scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
|
| - std::unique_ptr<BackToBackBeginFrameSource> begin_frame_source_;
|
| + BackToBackBeginFrameSource begin_frame_source_;
|
| SurfaceIdAllocator allocator_;
|
|
|
| const gfx::Size display_size_;
|
|
|