Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Side by Side Diff: blimp/client/app/compositor/browser_compositor.cc

Issue 2317753002: cc: Abstract the LayerTreeHost. (Closed)
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/app/compositor/browser_compositor.h" 5 #include "blimp/client/app/compositor/browser_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"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 compositor_dependencies_->GetGpuMemoryBufferManager(); 84 compositor_dependencies_->GetGpuMemoryBufferManager();
85 params.task_graph_runner = g_task_graph_runner.Pointer(); 85 params.task_graph_runner = g_task_graph_runner.Pointer();
86 cc::LayerTreeSettings settings; 86 cc::LayerTreeSettings settings;
87 params.settings = &settings; 87 params.settings = &settings;
88 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); 88 params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
89 params.animation_host = cc::AnimationHost::CreateMainInstance(); 89 params.animation_host = cc::AnimationHost::CreateMainInstance();
90 host_ = cc::LayerTreeHost::CreateSingleThreaded(this, &params); 90 host_ = cc::LayerTreeHost::CreateSingleThreaded(this, &params);
91 91
92 root_layer_->SetBackgroundColor(SK_ColorWHITE); 92 root_layer_->SetBackgroundColor(SK_ColorWHITE);
93 host_->GetLayerTree()->SetRootLayer(root_layer_); 93 host_->GetLayerTree()->SetRootLayer(root_layer_);
94 host_->set_surface_client_id(surface_id_allocator_->client_id()); 94 host_->SetSurfaceClientId(surface_id_allocator_->client_id());
95 } 95 }
96 96
97 BrowserCompositor::~BrowserCompositor() { 97 BrowserCompositor::~BrowserCompositor() {
98 compositor_dependencies_->GetSurfaceManager()->InvalidateSurfaceClientId( 98 compositor_dependencies_->GetSurfaceManager()->InvalidateSurfaceClientId(
99 surface_id_allocator_->client_id()); 99 surface_id_allocator_->client_id());
100 } 100 }
101 101
102 void BrowserCompositor::SetContentLayer( 102 void BrowserCompositor::SetContentLayer(
103 scoped_refptr<cc::Layer> content_layer) { 103 scoped_refptr<cc::Layer> content_layer) {
104 root_layer_->RemoveAllChildren(); 104 root_layer_->RemoveAllChildren();
(...skipping 10 matching lines...) Expand all
115 // Update the display. 115 // Update the display.
116 if (display_) { 116 if (display_) {
117 display_->Resize(viewport_size_in_px_); 117 display_->Resize(viewport_size_in_px_);
118 } 118 }
119 } 119 }
120 120
121 void BrowserCompositor::SetAcceleratedWidget(gfx::AcceleratedWidget widget) { 121 void BrowserCompositor::SetAcceleratedWidget(gfx::AcceleratedWidget widget) {
122 // Kill all references to the old widget. 122 // Kill all references to the old widget.
123 if (widget_ != gfx::kNullAcceleratedWidget) { 123 if (widget_ != gfx::kNullAcceleratedWidget) {
124 // We are always visible if we have a widget. 124 // We are always visible if we have a widget.
125 DCHECK(host_->visible()); 125 DCHECK(host_->IsVisible());
126 host_->SetVisible(false); 126 host_->SetVisible(false);
127 host_->ReleaseOutputSurface(); 127 host_->ReleaseOutputSurface();
128 display_.reset(); 128 display_.reset();
129 } 129 }
130 130
131 widget_ = gfx::kNullAcceleratedWidget; 131 widget_ = gfx::kNullAcceleratedWidget;
132 132
133 if (widget != gfx::kNullAcceleratedWidget) { 133 if (widget != gfx::kNullAcceleratedWidget) {
134 widget_ = widget; 134 widget_ = widget;
135 host_->SetVisible(true); 135 host_->SetVisible(true);
(...skipping 21 matching lines...) Expand all
157 void BrowserCompositor::DidCompleteSwapBuffers() { 157 void BrowserCompositor::DidCompleteSwapBuffers() {
158 if (!did_complete_swap_buffers_.is_null()) { 158 if (!did_complete_swap_buffers_.is_null()) {
159 did_complete_swap_buffers_.Run(); 159 did_complete_swap_buffers_.Run();
160 } 160 }
161 } 161 }
162 162
163 void BrowserCompositor::HandlePendingOutputSurfaceRequest() { 163 void BrowserCompositor::HandlePendingOutputSurfaceRequest() {
164 DCHECK(output_surface_request_pending_); 164 DCHECK(output_surface_request_pending_);
165 165
166 // Can't handle the request right now since we don't have a widget. 166 // Can't handle the request right now since we don't have a widget.
167 if (!host_->visible()) 167 if (!host_->IsVisible())
168 return; 168 return;
169 169
170 DCHECK_NE(gfx::kNullAcceleratedWidget, widget_); 170 DCHECK_NE(gfx::kNullAcceleratedWidget, widget_);
171 171
172 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = 172 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
173 compositor_dependencies_->GetGpuMemoryBufferManager(); 173 compositor_dependencies_->GetGpuMemoryBufferManager();
174 174
175 scoped_refptr<cc::ContextProvider> context_provider = 175 scoped_refptr<cc::ContextProvider> context_provider =
176 BlimpContextProvider::Create(widget_, gpu_memory_buffer_manager); 176 BlimpContextProvider::Create(widget_, gpu_memory_buffer_manager);
177 177
178 std::unique_ptr<cc::OutputSurface> display_output_surface = 178 std::unique_ptr<cc::OutputSurface> display_output_surface =
179 base::MakeUnique<DisplayOutputSurface>(context_provider); 179 base::MakeUnique<DisplayOutputSurface>(context_provider);
180 180
181 auto* task_runner = base::ThreadTaskRunnerHandle::Get().get(); 181 auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
182 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source( 182 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
183 new cc::DelayBasedBeginFrameSource( 183 new cc::DelayBasedBeginFrameSource(
184 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))); 184 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
185 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( 185 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
186 begin_frame_source.get(), task_runner, 186 begin_frame_source.get(), task_runner,
187 display_output_surface->capabilities().max_frames_pending)); 187 display_output_surface->capabilities().max_frames_pending));
188 188
189 display_ = base::MakeUnique<cc::Display>( 189 display_ = base::MakeUnique<cc::Display>(
190 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager, 190 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
191 host_->settings().renderer_settings, std::move(begin_frame_source), 191 host_->GetSettings().renderer_settings, std::move(begin_frame_source),
192 std::move(display_output_surface), std::move(scheduler), 192 std::move(display_output_surface), std::move(scheduler),
193 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)); 193 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
194 display_->SetVisible(true); 194 display_->SetVisible(true);
195 display_->Resize(viewport_size_in_px_); 195 display_->Resize(viewport_size_in_px_);
196 196
197 // The Browser compositor and display share the same context provider. 197 // The Browser compositor and display share the same context provider.
198 std::unique_ptr<cc::OutputSurface> delegated_output_surface = 198 std::unique_ptr<cc::OutputSurface> delegated_output_surface =
199 base::MakeUnique<cc::SurfaceDisplayOutputSurface>( 199 base::MakeUnique<cc::SurfaceDisplayOutputSurface>(
200 compositor_dependencies_->GetSurfaceManager(), 200 compositor_dependencies_->GetSurfaceManager(),
201 surface_id_allocator_.get(), display_.get(), context_provider, 201 surface_id_allocator_.get(), display_.get(), context_provider,
202 nullptr); 202 nullptr);
203 203
204 host_->SetOutputSurface(std::move(delegated_output_surface)); 204 host_->SetOutputSurface(std::move(delegated_output_surface));
205 } 205 }
206 206
207 } // namespace client 207 } // namespace client
208 } // namespace blimp 208 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/app/compositor/browser_compositor.h ('k') | blimp/client/core/compositor/blimp_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698