| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "cc/output/output_surface_client.h" | 9 #include "cc/output/output_surface_client.h" |
| 10 #include "cc/output/output_surface_frame.h" | 10 #include "cc/output/output_surface_frame.h" |
| 11 #include "components/display_compositor/buffer_queue.h" | 11 #include "components/display_compositor/buffer_queue.h" |
| 12 #include "components/display_compositor/compositor_overlay_candidate_validator.h
" | 12 #include "components/display_compositor/compositor_overlay_candidate_validator.h
" |
| 13 #include "components/display_compositor/gl_helper.h" | 13 #include "components/display_compositor/gl_helper.h" |
| 14 #include "content/browser/compositor/reflector_impl.h" | 14 #include "content/browser/compositor/reflector_impl.h" |
| 15 #include "content/common/gpu/client/context_provider_command_buffer.h" | 15 #include "content/common/gpu/client/context_provider_command_buffer.h" |
| 16 #include "gpu/GLES2/gl2extchromium.h" | 16 #include "gpu/GLES2/gl2extchromium.h" |
| 17 #include "gpu/command_buffer/client/gles2_interface.h" | 17 #include "gpu/command_buffer/client/gles2_interface.h" |
| 18 | 18 |
| 19 namespace content { | 19 namespace content { |
| 20 | 20 |
| 21 GpuSurfacelessBrowserCompositorOutputSurface:: | 21 GpuSurfacelessBrowserCompositorOutputSurface:: |
| 22 GpuSurfacelessBrowserCompositorOutputSurface( | 22 GpuSurfacelessBrowserCompositorOutputSurface( |
| 23 scoped_refptr<ContextProviderCommandBuffer> context, | 23 scoped_refptr<ContextProviderCommandBuffer> context, |
| 24 gpu::SurfaceHandle surface_handle, | 24 gpu::SurfaceHandle surface_handle, |
| 25 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, | 25 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, |
| 26 cc::SyntheticBeginFrameSource* begin_frame_source, | |
| 27 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> | 26 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
| 28 overlay_candidate_validator, | 27 overlay_candidate_validator, |
| 29 unsigned int target, | 28 unsigned int target, |
| 30 unsigned int internalformat, | 29 unsigned int internalformat, |
| 31 gfx::BufferFormat format, | 30 gfx::BufferFormat format, |
| 32 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) | 31 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) |
| 33 : GpuBrowserCompositorOutputSurface(std::move(context), | 32 : GpuBrowserCompositorOutputSurface(std::move(context), |
| 34 std::move(vsync_manager), | 33 std::move(vsync_manager), |
| 35 begin_frame_source, | |
| 36 std::move(overlay_candidate_validator)), | 34 std::move(overlay_candidate_validator)), |
| 37 gpu_memory_buffer_manager_(gpu_memory_buffer_manager) { | 35 gpu_memory_buffer_manager_(gpu_memory_buffer_manager) { |
| 38 capabilities_.uses_default_gl_framebuffer = false; | 36 capabilities_.uses_default_gl_framebuffer = false; |
| 39 capabilities_.flipped_output_surface = true; | 37 capabilities_.flipped_output_surface = true; |
| 40 // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling | 38 // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling |
| 41 // more closely with the previous surfaced behavior. | 39 // more closely with the previous surfaced behavior. |
| 42 // With a surface, swap buffer ack used to return early, before actually | 40 // With a surface, swap buffer ack used to return early, before actually |
| 43 // presenting the back buffer, enabling the browser compositor to run ahead. | 41 // presenting the back buffer, enabling the browser compositor to run ahead. |
| 44 // Surfaceless implementation acks at the time of actual buffer swap, which | 42 // Surfaceless implementation acks at the time of actual buffer swap, which |
| 45 // shifts the start of the new frame forward relative to the old | 43 // shifts the start of the new frame forward relative to the old |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 force_swap = true; | 112 force_swap = true; |
| 115 } | 113 } |
| 116 buffer_queue_->PageFlipComplete(); | 114 buffer_queue_->PageFlipComplete(); |
| 117 GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted( | 115 GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted( |
| 118 latency_info, result, params_mac); | 116 latency_info, result, params_mac); |
| 119 if (force_swap) | 117 if (force_swap) |
| 120 client_->SetNeedsRedrawRect(gfx::Rect(swap_size_)); | 118 client_->SetNeedsRedrawRect(gfx::Rect(swap_size_)); |
| 121 } | 119 } |
| 122 | 120 |
| 123 } // namespace content | 121 } // namespace content |
| OLD | NEW |