| 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_surfaceless_browser_compositor_output_s
urface.h" | 5 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_s
urface.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "content/browser/compositor/buffer_queue.h" | 8 #include "content/browser/compositor/buffer_queue.h" |
| 9 #include "content/browser/compositor/reflector_impl.h" | 9 #include "content/browser/compositor/reflector_impl.h" |
| 10 #include "content/browser/gpu/gpu_surface_tracker.h" | 10 #include "content/browser/gpu/gpu_surface_tracker.h" |
| 11 #include "content/common/gpu/client/context_provider_command_buffer.h" | 11 #include "content/common/gpu/client/context_provider_command_buffer.h" |
| 12 #include "gpu/GLES2/gl2extchromium.h" | 12 #include "gpu/GLES2/gl2extchromium.h" |
| 13 #include "gpu/command_buffer/client/gles2_interface.h" | 13 #include "gpu/command_buffer/client/gles2_interface.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 | 16 |
| 17 GpuSurfacelessBrowserCompositorOutputSurface:: | 17 GpuSurfacelessBrowserCompositorOutputSurface:: |
| 18 GpuSurfacelessBrowserCompositorOutputSurface( | 18 GpuSurfacelessBrowserCompositorOutputSurface( |
| 19 const scoped_refptr<ContextProviderCommandBuffer>& context, | 19 const scoped_refptr<ContextProviderCommandBuffer>& context, |
| 20 int surface_id, | 20 int surface_id, |
| 21 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 21 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
| 22 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | |
| 23 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator, | 22 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator, |
| 24 unsigned internalformat) | 23 unsigned internalformat) |
| 25 : GpuBrowserCompositorOutputSurface(context, | 24 : GpuBrowserCompositorOutputSurface(context, |
| 26 surface_id, | 25 surface_id, |
| 27 output_surface_map, | 26 output_surface_map, |
| 28 vsync_manager, | |
| 29 overlay_candidate_validator.Pass()), | 27 overlay_candidate_validator.Pass()), |
| 30 internalformat_(internalformat) { | 28 internalformat_(internalformat) { |
| 31 } | 29 } |
| 32 | 30 |
| 33 GpuSurfacelessBrowserCompositorOutputSurface:: | 31 GpuSurfacelessBrowserCompositorOutputSurface:: |
| 34 ~GpuSurfacelessBrowserCompositorOutputSurface() { | 32 ~GpuSurfacelessBrowserCompositorOutputSurface() { |
| 35 } | 33 } |
| 36 | 34 |
| 37 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers( | 35 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers( |
| 38 cc::CompositorFrame* frame) { | 36 cc::CompositorFrame* frame) { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 75 |
| 78 bool GpuSurfacelessBrowserCompositorOutputSurface::BindToClient( | 76 bool GpuSurfacelessBrowserCompositorOutputSurface::BindToClient( |
| 79 cc::OutputSurfaceClient* client) { | 77 cc::OutputSurfaceClient* client) { |
| 80 if (!GpuBrowserCompositorOutputSurface::BindToClient(client)) | 78 if (!GpuBrowserCompositorOutputSurface::BindToClient(client)) |
| 81 return false; | 79 return false; |
| 82 output_surface_.reset(new BufferQueue(context_provider_, internalformat_)); | 80 output_surface_.reset(new BufferQueue(context_provider_, internalformat_)); |
| 83 return output_surface_->Initialize(); | 81 return output_surface_->Initialize(); |
| 84 } | 82 } |
| 85 | 83 |
| 86 } // namespace content | 84 } // namespace content |
| OLD | NEW |