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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 &output_surface_map_, | 191 &output_surface_map_, |
192 compositor->vsync_manager())); | 192 compositor->vsync_manager())); |
193 } else { | 193 } else { |
194 display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( | 194 display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface( |
195 context_provider, | 195 context_provider, |
196 per_compositor_data_[compositor]->surface_id, | 196 per_compositor_data_[compositor]->surface_id, |
197 &output_surface_map_, | 197 &output_surface_map_, |
198 compositor->vsync_manager(), | 198 compositor->vsync_manager(), |
199 CreateOverlayCandidateValidator(compositor->widget()))); | 199 CreateOverlayCandidateValidator(compositor->widget()))); |
200 } | 200 } |
201 scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient( | 201 scoped_ptr<OnscreenDisplayClient> display_client( |
202 display_surface.Pass(), manager, compositor->task_runner())); | 202 new OnscreenDisplayClient(display_surface.Pass(), |
| 203 manager, |
| 204 compositor->GetLayerTreeSettings(), |
| 205 compositor->task_runner())); |
203 | 206 |
204 scoped_ptr<SurfaceDisplayOutputSurface> output_surface( | 207 scoped_ptr<SurfaceDisplayOutputSurface> output_surface( |
205 new SurfaceDisplayOutputSurface( | 208 new SurfaceDisplayOutputSurface( |
206 manager, compositor->surface_id_allocator(), context_provider)); | 209 manager, compositor->surface_id_allocator(), context_provider)); |
207 display_client->set_surface_output_surface(output_surface.get()); | 210 display_client->set_surface_output_surface(output_surface.get()); |
208 output_surface->set_display_client(display_client.get()); | 211 output_surface->set_display_client(display_client.get()); |
209 data->display_client = display_client.Pass(); | 212 data->display_client = display_client.Pass(); |
210 return output_surface.Pass(); | 213 return output_surface.Pass(); |
211 } | 214 } |
212 | 215 |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, | 474 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, |
472 observer_list_, | 475 observer_list_, |
473 OnLostResources()); | 476 OnLostResources()); |
474 | 477 |
475 // Kill things that use the shared context before killing the shared context. | 478 // Kill things that use the shared context before killing the shared context. |
476 lost_gl_helper.reset(); | 479 lost_gl_helper.reset(); |
477 lost_shared_main_thread_contexts = NULL; | 480 lost_shared_main_thread_contexts = NULL; |
478 } | 481 } |
479 | 482 |
480 } // namespace content | 483 } // namespace content |
OLD | NEW |