| 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" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 14 #include "cc/output/compositor_frame.h" | 14 #include "cc/output/compositor_frame.h" |
| 15 #include "cc/output/context_provider.h" | 15 #include "cc/output/context_provider.h" |
| 16 #include "cc/output/output_surface_client.h" | 16 #include "cc/output/output_surface_client.h" |
| 17 #include "cc/scheduler/delay_based_time_source.h" |
| 17 #include "cc/surfaces/surface_display_output_surface.h" | 18 #include "cc/surfaces/surface_display_output_surface.h" |
| 18 #include "cc/surfaces/surface_id_allocator.h" | 19 #include "cc/surfaces/surface_id_allocator.h" |
| 19 #include "cc/test/pixel_test_output_surface.h" | 20 #include "cc/test/pixel_test_output_surface.h" |
| 20 #include "cc/test/test_shared_bitmap_manager.h" | 21 #include "cc/test/test_shared_bitmap_manager.h" |
| 21 #include "gpu/command_buffer/client/context_support.h" | 22 #include "gpu/command_buffer/client/context_support.h" |
| 22 #include "gpu/command_buffer/client/gles2_interface.h" | 23 #include "gpu/command_buffer/client/gles2_interface.h" |
| 23 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 24 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 24 #include "ui/compositor/compositor_switches.h" | 25 #include "ui/compositor/compositor_switches.h" |
| 25 #include "ui/compositor/layer.h" | 26 #include "ui/compositor/layer.h" |
| 26 #include "ui/compositor/reflector.h" | 27 #include "ui/compositor/reflector.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 attribs.fail_if_major_perf_caveat = false; | 144 attribs.fail_if_major_perf_caveat = false; |
| 144 attribs.bind_generates_resource = false; | 145 attribs.bind_generates_resource = false; |
| 145 scoped_refptr<InProcessContextProvider> context_provider = | 146 scoped_refptr<InProcessContextProvider> context_provider = |
| 146 InProcessContextProvider::Create( | 147 InProcessContextProvider::Create( |
| 147 attribs, shared_worker_context_provider_.get(), | 148 attribs, shared_worker_context_provider_.get(), |
| 148 &gpu_memory_buffer_manager_, &image_factory_, compositor->widget(), | 149 &gpu_memory_buffer_manager_, &image_factory_, compositor->widget(), |
| 149 "UICompositor"); | 150 "UICompositor"); |
| 150 | 151 |
| 151 std::unique_ptr<cc::OutputSurface> display_output_surface; | 152 std::unique_ptr<cc::OutputSurface> display_output_surface; |
| 152 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source( | 153 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source( |
| 153 new cc::SyntheticBeginFrameSource(compositor->task_runner().get(), | 154 new cc::SyntheticBeginFrameSource( |
| 154 cc::BeginFrameArgs::DefaultInterval())); | 155 base::MakeUnique<cc::DelayBasedTimeSource>( |
| 156 compositor->task_runner().get()))); |
| 155 | 157 |
| 156 if (use_test_surface_) { | 158 if (use_test_surface_) { |
| 157 bool flipped_output_surface = false; | 159 bool flipped_output_surface = false; |
| 158 display_output_surface = base::WrapUnique(new cc::PixelTestOutputSurface( | 160 display_output_surface = base::WrapUnique(new cc::PixelTestOutputSurface( |
| 159 context_provider, shared_worker_context_provider_, | 161 context_provider, shared_worker_context_provider_, |
| 160 flipped_output_surface, std::move(begin_frame_source))); | 162 flipped_output_surface, std::move(begin_frame_source))); |
| 161 } else { | 163 } else { |
| 162 display_output_surface = base::WrapUnique(new DirectOutputSurface( | 164 display_output_surface = base::WrapUnique(new DirectOutputSurface( |
| 163 context_provider, shared_worker_context_provider_, | 165 context_provider, shared_worker_context_provider_, |
| 164 std::move(begin_frame_source))); | 166 std::move(begin_frame_source))); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 } | 253 } |
| 252 | 254 |
| 253 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor, | 255 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor, |
| 254 const gfx::Size& size) { | 256 const gfx::Size& size) { |
| 255 if (!per_compositor_data_.count(compositor)) | 257 if (!per_compositor_data_.count(compositor)) |
| 256 return; | 258 return; |
| 257 per_compositor_data_[compositor]->Resize(size); | 259 per_compositor_data_[compositor]->Resize(size); |
| 258 } | 260 } |
| 259 | 261 |
| 260 } // namespace ui | 262 } // namespace ui |
| OLD | NEW |