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/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
10 #include "cc/output/output_surface_client.h" | 10 #include "cc/output/output_surface_client.h" |
11 #include "content/browser/compositor/browser_compositor_overlay_candidate_valida
tor.h" | 11 #include "content/browser/compositor/browser_compositor_overlay_candidate_valida
tor.h" |
12 #include "content/browser/compositor/buffer_queue.h" | 12 #include "content/browser/compositor/buffer_queue.h" |
13 #include "content/browser/compositor/gl_helper.h" | 13 #include "content/browser/compositor/gl_helper.h" |
14 #include "content/browser/compositor/reflector_impl.h" | 14 #include "content/browser/compositor/reflector_impl.h" |
15 #include "content/browser/gpu/gpu_surface_tracker.h" | 15 #include "content/browser/gpu/gpu_surface_tracker.h" |
16 #include "content/common/gpu/client/context_provider_command_buffer.h" | 16 #include "content/common/gpu/client/context_provider_command_buffer.h" |
17 #include "gpu/GLES2/gl2extchromium.h" | 17 #include "gpu/GLES2/gl2extchromium.h" |
18 #include "gpu/command_buffer/client/gles2_interface.h" | 18 #include "gpu/command_buffer/client/gles2_interface.h" |
19 | 19 |
20 namespace content { | 20 namespace content { |
21 | 21 |
22 GpuSurfacelessBrowserCompositorOutputSurface:: | 22 GpuSurfacelessBrowserCompositorOutputSurface:: |
23 GpuSurfacelessBrowserCompositorOutputSurface( | 23 GpuSurfacelessBrowserCompositorOutputSurface( |
24 const scoped_refptr<ContextProviderCommandBuffer>& context, | 24 const scoped_refptr<ContextProviderCommandBuffer>& context, |
25 const scoped_refptr<ContextProviderCommandBuffer>& worker_context, | 25 const scoped_refptr<ContextProviderCommandBuffer>& worker_context, |
26 int surface_id, | 26 int surface_id, |
27 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 27 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
| 28 base::SingleThreadTaskRunner* task_runner, |
28 std::unique_ptr<BrowserCompositorOverlayCandidateValidator> | 29 std::unique_ptr<BrowserCompositorOverlayCandidateValidator> |
29 overlay_candidate_validator, | 30 overlay_candidate_validator, |
30 unsigned int target, | 31 unsigned int target, |
31 unsigned int internalformat, | 32 unsigned int internalformat, |
32 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) | 33 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) |
33 : GpuBrowserCompositorOutputSurface(context, | 34 : GpuBrowserCompositorOutputSurface(context, |
34 worker_context, | 35 worker_context, |
35 vsync_manager, | 36 vsync_manager, |
| 37 task_runner, |
36 std::move(overlay_candidate_validator)), | 38 std::move(overlay_candidate_validator)), |
37 internalformat_(internalformat), | 39 internalformat_(internalformat), |
38 gpu_memory_buffer_manager_(gpu_memory_buffer_manager) { | 40 gpu_memory_buffer_manager_(gpu_memory_buffer_manager) { |
39 capabilities_.uses_default_gl_framebuffer = false; | 41 capabilities_.uses_default_gl_framebuffer = false; |
40 capabilities_.flipped_output_surface = true; | 42 capabilities_.flipped_output_surface = true; |
41 // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling | 43 // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling |
42 // more closely with the previous surfaced behavior. | 44 // more closely with the previous surfaced behavior. |
43 // With a surface, swap buffer ack used to return early, before actually | 45 // With a surface, swap buffer ack used to return early, before actually |
44 // presenting the back buffer, enabling the browser compositor to run ahead. | 46 // presenting the back buffer, enabling the browser compositor to run ahead. |
45 // Surfaceless implementation acks at the time of actual buffer swap, which | 47 // Surfaceless implementation acks at the time of actual buffer swap, which |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 output_surface_->RecreateBuffers(); | 109 output_surface_->RecreateBuffers(); |
108 force_swap = true; | 110 force_swap = true; |
109 } | 111 } |
110 GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(latency_info, | 112 GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(latency_info, |
111 result); | 113 result); |
112 if (force_swap) | 114 if (force_swap) |
113 client_->SetNeedsRedrawRect(gfx::Rect(SurfaceSize())); | 115 client_->SetNeedsRedrawRect(gfx::Rect(SurfaceSize())); |
114 } | 116 } |
115 | 117 |
116 } // namespace content | 118 } // namespace content |
OLD | NEW |