OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/support/compositor/blimp_embedder_compositor.h" | 5 #include "blimp/client/support/compositor/blimp_embedder_compositor.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
10 #include "blimp/client/public/compositor/compositor_dependencies.h" | 10 #include "blimp/client/public/compositor/compositor_dependencies.h" |
11 #include "blimp/client/support/compositor/blimp_context_provider.h" | 11 #include "blimp/client/support/compositor/blimp_context_provider.h" |
12 #include "cc/animation/animation_host.h" | 12 #include "cc/animation/animation_host.h" |
13 #include "cc/layers/layer.h" | 13 #include "cc/layers/layer.h" |
14 #include "cc/output/compositor_frame.h" | 14 #include "cc/output/compositor_frame.h" |
| 15 #include "cc/output/output_surface.h" |
15 #include "cc/output/texture_mailbox_deleter.h" | 16 #include "cc/output/texture_mailbox_deleter.h" |
16 #include "cc/raster/single_thread_task_graph_runner.h" | 17 #include "cc/raster/single_thread_task_graph_runner.h" |
| 18 #include "cc/surfaces/direct_compositor_frame_sink.h" |
17 #include "cc/surfaces/display.h" | 19 #include "cc/surfaces/display.h" |
18 #include "cc/surfaces/surface_display_output_surface.h" | |
19 #include "cc/surfaces/surface_id_allocator.h" | 20 #include "cc/surfaces/surface_id_allocator.h" |
20 #include "cc/surfaces/surface_manager.h" | 21 #include "cc/surfaces/surface_manager.h" |
21 #include "cc/trees/layer_tree_host.h" | 22 #include "cc/trees/layer_tree_host.h" |
22 #include "gpu/command_buffer/client/context_support.h" | 23 #include "gpu/command_buffer/client/context_support.h" |
23 #include "gpu/command_buffer/client/gles2_lib.h" | 24 #include "gpu/command_buffer/client/gles2_lib.h" |
24 | 25 |
25 namespace blimp { | 26 namespace blimp { |
26 namespace client { | 27 namespace client { |
27 | 28 |
28 namespace { | 29 namespace { |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner = | 66 base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner = |
66 LAZY_INSTANCE_INITIALIZER; | 67 LAZY_INSTANCE_INITIALIZER; |
67 | 68 |
68 } // namespace | 69 } // namespace |
69 | 70 |
70 BlimpEmbedderCompositor::BlimpEmbedderCompositor( | 71 BlimpEmbedderCompositor::BlimpEmbedderCompositor( |
71 CompositorDependencies* compositor_dependencies) | 72 CompositorDependencies* compositor_dependencies) |
72 : compositor_dependencies_(compositor_dependencies), | 73 : compositor_dependencies_(compositor_dependencies), |
73 surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>( | 74 surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>( |
74 compositor_dependencies->AllocateSurfaceClientId())), | 75 compositor_dependencies->AllocateSurfaceClientId())), |
75 output_surface_request_pending_(false), | 76 compositor_frame_sink_request_pending_(false), |
76 root_layer_(cc::Layer::Create()) { | 77 root_layer_(cc::Layer::Create()) { |
77 compositor_dependencies_->GetSurfaceManager()->RegisterSurfaceClientId( | 78 compositor_dependencies_->GetSurfaceManager()->RegisterSurfaceClientId( |
78 surface_id_allocator_->client_id()); | 79 surface_id_allocator_->client_id()); |
79 | 80 |
80 cc::LayerTreeHost::InitParams params; | 81 cc::LayerTreeHost::InitParams params; |
81 params.client = this; | 82 params.client = this; |
82 params.gpu_memory_buffer_manager = | 83 params.gpu_memory_buffer_manager = |
83 compositor_dependencies_->GetGpuMemoryBufferManager(); | 84 compositor_dependencies_->GetGpuMemoryBufferManager(); |
84 params.task_graph_runner = g_task_graph_runner.Pointer(); | 85 params.task_graph_runner = g_task_graph_runner.Pointer(); |
85 cc::LayerTreeSettings settings; | 86 cc::LayerTreeSettings settings; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 if (display_) { | 118 if (display_) { |
118 display_->Resize(viewport_size_in_px_); | 119 display_->Resize(viewport_size_in_px_); |
119 } | 120 } |
120 } | 121 } |
121 | 122 |
122 void BlimpEmbedderCompositor::SetContextProvider( | 123 void BlimpEmbedderCompositor::SetContextProvider( |
123 scoped_refptr<cc::ContextProvider> context_provider) { | 124 scoped_refptr<cc::ContextProvider> context_provider) { |
124 if (context_provider_) { | 125 if (context_provider_) { |
125 DCHECK(host_->IsVisible()); | 126 DCHECK(host_->IsVisible()); |
126 host_->SetVisible(false); | 127 host_->SetVisible(false); |
127 host_->ReleaseOutputSurface(); | 128 host_->ReleaseCompositorFrameSink(); |
128 display_.reset(); | 129 display_.reset(); |
129 } | 130 } |
130 | 131 |
131 context_provider_ = std::move(context_provider); | 132 context_provider_ = std::move(context_provider); |
132 | 133 |
133 if (context_provider_) { | 134 if (context_provider_) { |
134 host_->SetVisible(true); | 135 host_->SetVisible(true); |
135 if (output_surface_request_pending_) { | 136 if (compositor_frame_sink_request_pending_) { |
136 HandlePendingOutputSurfaceRequest(); | 137 HandlePendingCompositorFrameSinkRequest(); |
137 } | 138 } |
138 } | 139 } |
139 } | 140 } |
140 | 141 |
141 void BlimpEmbedderCompositor::RequestNewOutputSurface() { | 142 void BlimpEmbedderCompositor::RequestNewCompositorFrameSink() { |
142 DCHECK(!output_surface_request_pending_) | 143 DCHECK(!compositor_frame_sink_request_pending_) |
143 << "We already have a pending request?"; | 144 << "We already have a pending request?"; |
144 output_surface_request_pending_ = true; | 145 compositor_frame_sink_request_pending_ = true; |
145 HandlePendingOutputSurfaceRequest(); | 146 HandlePendingCompositorFrameSinkRequest(); |
146 } | 147 } |
147 | 148 |
148 void BlimpEmbedderCompositor::DidInitializeOutputSurface() { | 149 void BlimpEmbedderCompositor::DidInitializeCompositorFrameSink() { |
149 output_surface_request_pending_ = false; | 150 compositor_frame_sink_request_pending_ = false; |
150 } | 151 } |
151 | 152 |
152 void BlimpEmbedderCompositor::DidFailToInitializeOutputSurface() { | 153 void BlimpEmbedderCompositor::DidFailToInitializeCompositorFrameSink() { |
153 NOTREACHED() << "Can't fail to initialize the OutputSurface here"; | 154 NOTREACHED() << "Can't fail to initialize the CompositorFrameSink here"; |
154 } | 155 } |
155 | 156 |
156 void BlimpEmbedderCompositor::HandlePendingOutputSurfaceRequest() { | 157 void BlimpEmbedderCompositor::HandlePendingCompositorFrameSinkRequest() { |
157 DCHECK(output_surface_request_pending_); | 158 DCHECK(compositor_frame_sink_request_pending_); |
158 | 159 |
159 // Can't handle the request right now since we don't have a widget. | 160 // Can't handle the request right now since we don't have a widget. |
160 if (!host_->IsVisible()) | 161 if (!host_->IsVisible()) |
161 return; | 162 return; |
162 | 163 |
163 DCHECK(context_provider_); | 164 DCHECK(context_provider_); |
164 | 165 |
165 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = | 166 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = |
166 compositor_dependencies_->GetGpuMemoryBufferManager(); | 167 compositor_dependencies_->GetGpuMemoryBufferManager(); |
167 | 168 |
168 std::unique_ptr<cc::OutputSurface> display_output_surface = | 169 auto display_output_surface = |
169 base::MakeUnique<DisplayOutputSurface>(context_provider_); | 170 base::MakeUnique<DisplayOutputSurface>(context_provider_); |
170 | 171 |
171 auto* task_runner = base::ThreadTaskRunnerHandle::Get().get(); | 172 auto* task_runner = base::ThreadTaskRunnerHandle::Get().get(); |
172 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source( | 173 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source( |
173 new cc::DelayBasedBeginFrameSource( | 174 new cc::DelayBasedBeginFrameSource( |
174 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))); | 175 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))); |
175 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( | 176 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( |
176 begin_frame_source.get(), task_runner, | 177 begin_frame_source.get(), task_runner, |
177 display_output_surface->capabilities().max_frames_pending)); | 178 display_output_surface->capabilities().max_frames_pending)); |
178 | 179 |
179 display_ = base::MakeUnique<cc::Display>( | 180 display_ = base::MakeUnique<cc::Display>( |
180 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager, | 181 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager, |
181 host_->GetSettings().renderer_settings, std::move(begin_frame_source), | 182 host_->GetSettings().renderer_settings, std::move(begin_frame_source), |
182 std::move(display_output_surface), std::move(scheduler), | 183 std::move(display_output_surface), std::move(scheduler), |
183 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)); | 184 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)); |
184 display_->SetVisible(true); | 185 display_->SetVisible(true); |
185 display_->Resize(viewport_size_in_px_); | 186 display_->Resize(viewport_size_in_px_); |
186 | 187 |
187 // The Browser compositor and display share the same context provider. | 188 // The Browser compositor and display share the same context provider. |
188 std::unique_ptr<cc::OutputSurface> delegated_output_surface = | 189 auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>( |
189 base::MakeUnique<cc::SurfaceDisplayOutputSurface>( | 190 compositor_dependencies_->GetSurfaceManager(), |
190 compositor_dependencies_->GetSurfaceManager(), | 191 surface_id_allocator_.get(), display_.get(), context_provider_, nullptr); |
191 surface_id_allocator_.get(), display_.get(), context_provider_, | |
192 nullptr); | |
193 | 192 |
194 host_->SetOutputSurface(std::move(delegated_output_surface)); | 193 host_->SetCompositorFrameSink(std::move(compositor_frame_sink)); |
195 } | 194 } |
196 | 195 |
197 } // namespace client | 196 } // namespace client |
198 } // namespace blimp | 197 } // namespace blimp |
OLD | NEW |