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

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

Issue 2286273003: Make cc::Display not own its BeginFrameSource (Closed)
Patch Set: Fix webview 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
« no previous file with comments | « blimp/client/app/compositor/browser_compositor.h ('k') | cc/surfaces/display.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
183 new cc::DelayBasedBeginFrameSource( 183 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
184 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
185 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( 184 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
186 begin_frame_source.get(), task_runner, 185 begin_frame_source_.get(), task_runner,
187 display_output_surface->capabilities().max_frames_pending)); 186 display_output_surface->capabilities().max_frames_pending));
188 187
189 display_ = base::MakeUnique<cc::Display>( 188 display_ = base::MakeUnique<cc::Display>(
190 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager, 189 nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
191 host_->settings().renderer_settings, std::move(begin_frame_source), 190 host_->settings().renderer_settings, begin_frame_source_.get(),
192 std::move(display_output_surface), std::move(scheduler), 191 std::move(display_output_surface), std::move(scheduler),
193 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)); 192 base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
194 display_->SetVisible(true); 193 display_->SetVisible(true);
195 display_->Resize(viewport_size_in_px_); 194 display_->Resize(viewport_size_in_px_);
196 195
197 // The Browser compositor and display share the same context provider. 196 // The Browser compositor and display share the same context provider.
198 std::unique_ptr<cc::OutputSurface> delegated_output_surface = 197 std::unique_ptr<cc::OutputSurface> delegated_output_surface =
199 base::MakeUnique<cc::SurfaceDisplayOutputSurface>( 198 base::MakeUnique<cc::SurfaceDisplayOutputSurface>(
200 compositor_dependencies_->GetSurfaceManager(), 199 compositor_dependencies_->GetSurfaceManager(),
201 surface_id_allocator_.get(), display_.get(), context_provider, 200 surface_id_allocator_.get(), display_.get(), context_provider,
202 nullptr); 201 nullptr);
203 202
204 host_->SetOutputSurface(std::move(delegated_output_surface)); 203 host_->SetOutputSurface(std::move(delegated_output_surface));
205 } 204 }
206 205
207 } // namespace client 206 } // namespace client
208 } // namespace blimp 207 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/app/compositor/browser_compositor.h ('k') | cc/surfaces/display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698