| 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 "ui/compositor/test/in_process_context_factory.h" | 5 #include "ui/compositor/test/in_process_context_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 } else { | 193 } else { |
| 194 display_output_surface = | 194 display_output_surface = |
| 195 base::MakeUnique<DirectOutputSurface>(context_provider); | 195 base::MakeUnique<DirectOutputSurface>(context_provider); |
| 196 } | 196 } |
| 197 | 197 |
| 198 std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source( | 198 std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source( |
| 199 new cc::DelayBasedBeginFrameSource( | 199 new cc::DelayBasedBeginFrameSource( |
| 200 base::MakeUnique<cc::DelayBasedTimeSource>( | 200 base::MakeUnique<cc::DelayBasedTimeSource>( |
| 201 compositor->task_runner().get()))); | 201 compositor->task_runner().get()))); |
| 202 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( | 202 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( |
| 203 begin_frame_source.get(), compositor->task_runner().get(), | 203 compositor->task_runner().get(), |
| 204 display_output_surface->capabilities().max_frames_pending)); | 204 display_output_surface->capabilities().max_frames_pending)); |
| 205 | 205 |
| 206 data->display = base::MakeUnique<cc::Display>( | 206 data->display = base::MakeUnique<cc::Display>( |
| 207 &shared_bitmap_manager_, &gpu_memory_buffer_manager_, | 207 &shared_bitmap_manager_, &gpu_memory_buffer_manager_, |
| 208 compositor->GetRendererSettings(), compositor->frame_sink_id(), | 208 compositor->GetRendererSettings(), compositor->frame_sink_id(), |
| 209 std::move(begin_frame_source), std::move(display_output_surface), | 209 std::move(begin_frame_source), std::move(display_output_surface), |
| 210 std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>( | 210 std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>( |
| 211 compositor->task_runner().get())); | 211 compositor->task_runner().get())); |
| 212 | 212 |
| 213 auto* display = per_compositor_data_[compositor.get()]->display.get(); | 213 auto* display = per_compositor_data_[compositor.get()]->display.get(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 data->surface_handle = tracker->AddSurfaceForNativeWidget(widget); | 322 data->surface_handle = tracker->AddSurfaceForNativeWidget(widget); |
| 323 #endif | 323 #endif |
| 324 } | 324 } |
| 325 | 325 |
| 326 PerCompositorData* return_ptr = data.get(); | 326 PerCompositorData* return_ptr = data.get(); |
| 327 per_compositor_data_[compositor] = std::move(data); | 327 per_compositor_data_[compositor] = std::move(data); |
| 328 return return_ptr; | 328 return return_ptr; |
| 329 } | 329 } |
| 330 | 330 |
| 331 } // namespace ui | 331 } // namespace ui |
| OLD | NEW |