| 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 "content/browser/compositor/gpu_process_transport_factory.h" | 5 #include "content/browser/compositor/gpu_process_transport_factory.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 compositor->vsync_manager())); | 223 compositor->vsync_manager())); |
| 224 } else { | 224 } else { |
| 225 display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( | 225 display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( |
| 226 context_provider, | 226 context_provider, |
| 227 data->surface_id, | 227 data->surface_id, |
| 228 &output_surface_map_, | 228 &output_surface_map_, |
| 229 compositor->vsync_manager(), | 229 compositor->vsync_manager(), |
| 230 CreateOverlayCandidateValidator(compositor->widget()))); | 230 CreateOverlayCandidateValidator(compositor->widget()))); |
| 231 } | 231 } |
| 232 scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient( | 232 scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient( |
| 233 display_surface.Pass(), manager, compositor->task_runner())); | 233 display_surface.Pass(), manager, compositor->GetRendererSettings(), |
| 234 compositor->task_runner())); |
| 234 | 235 |
| 235 scoped_ptr<SurfaceDisplayOutputSurface> output_surface( | 236 scoped_ptr<SurfaceDisplayOutputSurface> output_surface( |
| 236 new SurfaceDisplayOutputSurface( | 237 new SurfaceDisplayOutputSurface( |
| 237 manager, compositor->surface_id_allocator(), context_provider)); | 238 manager, compositor->surface_id_allocator(), context_provider)); |
| 238 display_client->set_surface_output_surface(output_surface.get()); | 239 display_client->set_surface_output_surface(output_surface.get()); |
| 239 output_surface->set_display_client(display_client.get()); | 240 output_surface->set_display_client(display_client.get()); |
| 240 data->display_client = display_client.Pass(); | 241 data->display_client = display_client.Pass(); |
| 241 compositor->SetOutputSurface(output_surface.Pass()); | 242 compositor->SetOutputSurface(output_surface.Pass()); |
| 242 return; | 243 return; |
| 243 } | 244 } |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, | 505 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, |
| 505 observer_list_, | 506 observer_list_, |
| 506 OnLostResources()); | 507 OnLostResources()); |
| 507 | 508 |
| 508 // Kill things that use the shared context before killing the shared context. | 509 // Kill things that use the shared context before killing the shared context. |
| 509 lost_gl_helper.reset(); | 510 lost_gl_helper.reset(); |
| 510 lost_shared_main_thread_contexts = NULL; | 511 lost_shared_main_thread_contexts = NULL; |
| 511 } | 512 } |
| 512 | 513 |
| 513 } // namespace content | 514 } // namespace content |
| OLD | NEW |