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/software_browser_compositor_output_surface.
h" | 5 #include "content/browser/compositor/software_browser_compositor_output_surface.
h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "cc/output/output_surface_client.h" | 15 #include "cc/output/output_surface_client.h" |
16 #include "cc/output/output_surface_frame.h" | 16 #include "cc/output/output_surface_frame.h" |
17 #include "cc/output/software_output_device.h" | 17 #include "cc/output/software_output_device.h" |
18 #include "content/browser/renderer_host/render_widget_host_impl.h" | 18 #include "content/browser/renderer_host/render_widget_host_impl.h" |
19 #include "ui/events/latency_info.h" | 19 #include "ui/events/latency_info.h" |
20 #include "ui/gfx/vsync_provider.h" | 20 #include "ui/gfx/vsync_provider.h" |
21 | 21 |
22 namespace content { | 22 namespace content { |
23 | 23 |
24 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface( | 24 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface( |
25 std::unique_ptr<cc::SoftwareOutputDevice> software_device, | 25 std::unique_ptr<cc::SoftwareOutputDevice> software_device, |
26 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 26 const UpdateVSyncParametersCallback& update_vsync_parameters_callback, |
27 cc::SyntheticBeginFrameSource* begin_frame_source, | |
28 scoped_refptr<base::SingleThreadTaskRunner> task_runner) | 27 scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
29 : BrowserCompositorOutputSurface(std::move(software_device), | 28 : BrowserCompositorOutputSurface(std::move(software_device), |
30 vsync_manager, | 29 update_vsync_parameters_callback), |
31 begin_frame_source), | |
32 task_runner_(std::move(task_runner)), | 30 task_runner_(std::move(task_runner)), |
33 weak_factory_(this) {} | 31 weak_factory_(this) {} |
34 | 32 |
35 SoftwareBrowserCompositorOutputSurface:: | 33 SoftwareBrowserCompositorOutputSurface:: |
36 ~SoftwareBrowserCompositorOutputSurface() { | 34 ~SoftwareBrowserCompositorOutputSurface() { |
37 } | 35 } |
38 | 36 |
39 void SoftwareBrowserCompositorOutputSurface::BindToClient( | 37 void SoftwareBrowserCompositorOutputSurface::BindToClient( |
40 cc::OutputSurfaceClient* client) { | 38 cc::OutputSurfaceClient* client) { |
41 DCHECK(client); | 39 DCHECK(client); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0, swap_time, 1); | 71 ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0, swap_time, 1); |
74 latency.AddLatencyNumberWithTimestamp( | 72 latency.AddLatencyNumberWithTimestamp( |
75 ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0, | 73 ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0, |
76 swap_time, 1); | 74 swap_time, 1); |
77 } | 75 } |
78 task_runner_->PostTask(FROM_HERE, | 76 task_runner_->PostTask(FROM_HERE, |
79 base::Bind(&RenderWidgetHostImpl::CompositorFrameDrawn, | 77 base::Bind(&RenderWidgetHostImpl::CompositorFrameDrawn, |
80 frame.latency_info)); | 78 frame.latency_info)); |
81 | 79 |
82 gfx::VSyncProvider* vsync_provider = software_device()->GetVSyncProvider(); | 80 gfx::VSyncProvider* vsync_provider = software_device()->GetVSyncProvider(); |
83 if (vsync_provider) { | 81 if (vsync_provider) |
84 vsync_provider->GetVSyncParameters(base::Bind( | 82 vsync_provider->GetVSyncParameters(update_vsync_parameters_callback_); |
85 &BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu, | |
86 weak_factory_.GetWeakPtr())); | |
87 } | |
88 | 83 |
89 task_runner_->PostTask( | 84 task_runner_->PostTask( |
90 FROM_HERE, | 85 FROM_HERE, |
91 base::Bind(&SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback, | 86 base::Bind(&SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback, |
92 weak_factory_.GetWeakPtr())); | 87 weak_factory_.GetWeakPtr())); |
93 } | 88 } |
94 | 89 |
95 void SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback() { | 90 void SoftwareBrowserCompositorOutputSurface::SwapBuffersCallback() { |
96 client_->DidReceiveSwapBuffersAck(); | 91 client_->DidReceiveSwapBuffersAck(); |
97 } | 92 } |
(...skipping 18 matching lines...) Expand all Loading... |
116 return 0; | 111 return 0; |
117 } | 112 } |
118 | 113 |
119 #if defined(OS_MACOSX) | 114 #if defined(OS_MACOSX) |
120 void SoftwareBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle( | 115 void SoftwareBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle( |
121 bool suspended) { | 116 bool suspended) { |
122 } | 117 } |
123 #endif | 118 #endif |
124 | 119 |
125 } // namespace content | 120 } // namespace content |
OLD | NEW |