| 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 "base/memory/ptr_util.h" | 5 #include "base/memory/ptr_util.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "cc/output/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
| 10 #include "cc/scheduler/begin_frame_source.h" | 10 #include "cc/scheduler/begin_frame_source.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 void SetUp() override { | 125 void SetUp() override { |
| 126 bool enable_pixel_output = false; | 126 bool enable_pixel_output = false; |
| 127 ui::ContextFactory* context_factory = | 127 ui::ContextFactory* context_factory = |
| 128 ui::InitializeContextFactoryForTests(enable_pixel_output); | 128 ui::InitializeContextFactoryForTests(enable_pixel_output); |
| 129 ImageTransportFactory::InitializeForUnitTests( | 129 ImageTransportFactory::InitializeForUnitTests( |
| 130 std::unique_ptr<ImageTransportFactory>( | 130 std::unique_ptr<ImageTransportFactory>( |
| 131 new NoTransportImageTransportFactory)); | 131 new NoTransportImageTransportFactory)); |
| 132 message_loop_.reset(new base::MessageLoop()); | 132 message_loop_.reset(new base::MessageLoop()); |
| 133 task_runner_ = message_loop_->task_runner(); | 133 task_runner_ = message_loop_->task_runner(); |
| 134 compositor_task_runner_ = new FakeTaskRunner(); | 134 compositor_task_runner_ = new FakeTaskRunner(); |
| 135 begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource( | 135 begin_frame_source_.reset( |
| 136 base::MakeUnique<cc::DelayBasedTimeSource>( | 136 new cc::DelayBasedBeginFrameSource(compositor_task_runner_.get())); |
| 137 compositor_task_runner_.get()))); | |
| 138 compositor_.reset( | 137 compositor_.reset( |
| 139 new ui::Compositor(context_factory, compositor_task_runner_.get())); | 138 new ui::Compositor(context_factory, compositor_task_runner_.get())); |
| 140 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); | 139 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); |
| 141 output_surface_ = base::MakeUnique<TestOutputSurface>( | 140 output_surface_ = base::MakeUnique<TestOutputSurface>( |
| 142 cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()), | 141 cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()), |
| 143 compositor_->vsync_manager(), begin_frame_source_.get()); | 142 compositor_->vsync_manager(), begin_frame_source_.get()); |
| 144 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 143 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
| 145 | 144 |
| 146 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); | 145 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); |
| 147 compositor_->SetRootLayer(root_layer_.get()); | 146 compositor_->SetRootLayer(root_layer_.get()); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 plane_2.plane_z_order = 1; | 224 plane_2.plane_z_order = 1; |
| 226 list.push_back(plane_1); | 225 list.push_back(plane_1); |
| 227 list.push_back(plane_2); | 226 list.push_back(plane_2); |
| 228 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 227 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 229 EXPECT_FALSE(list[0].overlay_handled); | 228 EXPECT_FALSE(list[0].overlay_handled); |
| 230 } | 229 } |
| 231 #endif // defined(USE_OZONE) | 230 #endif // defined(USE_OZONE) |
| 232 | 231 |
| 233 } // namespace | 232 } // namespace |
| 234 } // namespace content | 233 } // namespace content |
| OLD | NEW |