| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 | 233 |
| 234 scoped_ptr<BrowserCompositorOutputSurface> surface; | 234 scoped_ptr<BrowserCompositorOutputSurface> surface; |
| 235 #if defined(USE_OZONE) | 235 #if defined(USE_OZONE) |
| 236 if (ui::SurfaceFactoryOzone::GetInstance()->CanShowPrimaryPlaneAsOverlay()) { | 236 if (ui::SurfaceFactoryOzone::GetInstance()->CanShowPrimaryPlaneAsOverlay()) { |
| 237 surface.reset(new GpuSurfacelessBrowserCompositorOutputSurface( | 237 surface.reset(new GpuSurfacelessBrowserCompositorOutputSurface( |
| 238 context_provider, | 238 context_provider, |
| 239 per_compositor_data_[compositor]->surface_id, | 239 per_compositor_data_[compositor]->surface_id, |
| 240 &output_surface_map_, | 240 &output_surface_map_, |
| 241 compositor->vsync_manager(), | 241 compositor->vsync_manager(), |
| 242 CreateOverlayCandidateValidator(compositor->widget()), | 242 CreateOverlayCandidateValidator(compositor->widget()), |
| 243 GL_RGB8_OES)); | 243 GL_RGBX8_CHROMIUM)); |
| 244 } | 244 } |
| 245 #endif | 245 #endif |
| 246 if (!surface) | 246 if (!surface) |
| 247 surface.reset(new GpuBrowserCompositorOutputSurface( | 247 surface.reset(new GpuBrowserCompositorOutputSurface( |
| 248 context_provider, | 248 context_provider, |
| 249 per_compositor_data_[compositor]->surface_id, | 249 per_compositor_data_[compositor]->surface_id, |
| 250 &output_surface_map_, | 250 &output_surface_map_, |
| 251 compositor->vsync_manager(), | 251 compositor->vsync_manager(), |
| 252 CreateOverlayCandidateValidator(compositor->widget()))); | 252 CreateOverlayCandidateValidator(compositor->widget()))); |
| 253 | 253 |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, | 472 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, |
| 473 observer_list_, | 473 observer_list_, |
| 474 OnLostResources()); | 474 OnLostResources()); |
| 475 | 475 |
| 476 // Kill things that use the shared context before killing the shared context. | 476 // Kill things that use the shared context before killing the shared context. |
| 477 lost_gl_helper.reset(); | 477 lost_gl_helper.reset(); |
| 478 lost_shared_main_thread_contexts = NULL; | 478 lost_shared_main_thread_contexts = NULL; |
| 479 } | 479 } |
| 480 | 480 |
| 481 } // namespace content | 481 } // namespace content |
| OLD | NEW |