| 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> |
| 8 |
| 7 #include "base/bind.h" | 9 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 9 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
| 10 #include "cc/output/compositor_frame.h" | 12 #include "cc/output/compositor_frame.h" |
| 11 #include "cc/output/context_provider.h" | 13 #include "cc/output/context_provider.h" |
| 12 #include "cc/output/output_surface_client.h" | 14 #include "cc/output/output_surface_client.h" |
| 13 #include "cc/surfaces/onscreen_display_client.h" | 15 #include "cc/surfaces/onscreen_display_client.h" |
| 14 #include "cc/surfaces/surface_display_output_surface.h" | 16 #include "cc/surfaces/surface_display_output_surface.h" |
| 15 #include "cc/surfaces/surface_id_allocator.h" | 17 #include "cc/surfaces/surface_id_allocator.h" |
| 16 #include "cc/test/pixel_test_output_surface.h" | 18 #include "cc/test/pixel_test_output_surface.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 context_provider, shared_worker_context_provider_, | 148 context_provider, shared_worker_context_provider_, |
| 147 flipped_output_surface)); | 149 flipped_output_surface)); |
| 148 } else { | 150 } else { |
| 149 real_output_surface = make_scoped_ptr(new DirectOutputSurface( | 151 real_output_surface = make_scoped_ptr(new DirectOutputSurface( |
| 150 context_provider, shared_worker_context_provider_)); | 152 context_provider, shared_worker_context_provider_)); |
| 151 } | 153 } |
| 152 | 154 |
| 153 if (surface_manager_) { | 155 if (surface_manager_) { |
| 154 scoped_ptr<cc::OnscreenDisplayClient> display_client( | 156 scoped_ptr<cc::OnscreenDisplayClient> display_client( |
| 155 new cc::OnscreenDisplayClient( | 157 new cc::OnscreenDisplayClient( |
| 156 real_output_surface.Pass(), surface_manager_, | 158 std::move(real_output_surface), surface_manager_, |
| 157 GetSharedBitmapManager(), GetGpuMemoryBufferManager(), | 159 GetSharedBitmapManager(), GetGpuMemoryBufferManager(), |
| 158 compositor->GetRendererSettings(), compositor->task_runner())); | 160 compositor->GetRendererSettings(), compositor->task_runner())); |
| 159 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( | 161 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( |
| 160 new cc::SurfaceDisplayOutputSurface( | 162 new cc::SurfaceDisplayOutputSurface( |
| 161 surface_manager_, compositor->surface_id_allocator(), | 163 surface_manager_, compositor->surface_id_allocator(), |
| 162 context_provider, shared_worker_context_provider_)); | 164 context_provider, shared_worker_context_provider_)); |
| 163 display_client->set_surface_output_surface(surface_output_surface.get()); | 165 display_client->set_surface_output_surface(surface_output_surface.get()); |
| 164 surface_output_surface->set_display_client(display_client.get()); | 166 surface_output_surface->set_display_client(display_client.get()); |
| 165 | 167 |
| 166 compositor->SetOutputSurface(surface_output_surface.Pass()); | 168 compositor->SetOutputSurface(std::move(surface_output_surface)); |
| 167 | 169 |
| 168 delete per_compositor_data_[compositor.get()]; | 170 delete per_compositor_data_[compositor.get()]; |
| 169 per_compositor_data_[compositor.get()] = display_client.release(); | 171 per_compositor_data_[compositor.get()] = display_client.release(); |
| 170 } else { | 172 } else { |
| 171 compositor->SetOutputSurface(real_output_surface.Pass()); | 173 compositor->SetOutputSurface(std::move(real_output_surface)); |
| 172 } | 174 } |
| 173 } | 175 } |
| 174 | 176 |
| 175 scoped_ptr<Reflector> InProcessContextFactory::CreateReflector( | 177 scoped_ptr<Reflector> InProcessContextFactory::CreateReflector( |
| 176 Compositor* mirrored_compositor, | 178 Compositor* mirrored_compositor, |
| 177 Layer* mirroring_layer) { | 179 Layer* mirroring_layer) { |
| 178 return make_scoped_ptr(new FakeReflector); | 180 return make_scoped_ptr(new FakeReflector); |
| 179 } | 181 } |
| 180 | 182 |
| 181 void InProcessContextFactory::RemoveReflector(Reflector* reflector) { | 183 void InProcessContextFactory::RemoveReflector(Reflector* reflector) { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 } | 238 } |
| 237 | 239 |
| 238 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor, | 240 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor, |
| 239 const gfx::Size& size) { | 241 const gfx::Size& size) { |
| 240 if (!per_compositor_data_.count(compositor)) | 242 if (!per_compositor_data_.count(compositor)) |
| 241 return; | 243 return; |
| 242 per_compositor_data_[compositor]->display()->Resize(size); | 244 per_compositor_data_[compositor]->display()->Resize(size); |
| 243 } | 245 } |
| 244 | 246 |
| 245 } // namespace ui | 247 } // namespace ui |
| OLD | NEW |