| Index: content/browser/compositor/browser_compositor_output_surface.cc
|
| diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/compositor/browser_compositor_output_surface.cc
|
| index b93b865efe759fa4788091c0b7df3c096926a9b8..3d7943197f9b7dea71a007a418ee3a9c490da2b7 100644
|
| --- a/content/browser/compositor/browser_compositor_output_surface.cc
|
| +++ b/content/browser/compositor/browser_compositor_output_surface.cc
|
| @@ -22,34 +22,27 @@ namespace content {
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| scoped_refptr<cc::ContextProvider> context_provider,
|
| scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
|
| - cc::SyntheticBeginFrameSource* begin_frame_source,
|
| std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
|
| overlay_candidate_validator)
|
| : OutputSurface(std::move(context_provider)),
|
| vsync_manager_(std::move(vsync_manager)),
|
| - synthetic_begin_frame_source_(begin_frame_source),
|
| reflector_(nullptr) {
|
| overlay_candidate_validator_ = std::move(overlay_candidate_validator);
|
| }
|
|
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| std::unique_ptr<cc::SoftwareOutputDevice> software_device,
|
| - const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
|
| - cc::SyntheticBeginFrameSource* begin_frame_source)
|
| + const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
|
| : OutputSurface(std::move(software_device)),
|
| vsync_manager_(vsync_manager),
|
| - synthetic_begin_frame_source_(begin_frame_source),
|
| reflector_(nullptr) {}
|
|
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
|
| - const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
|
| - cc::SyntheticBeginFrameSource* begin_frame_source)
|
| + const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
|
| : OutputSurface(std::move(vulkan_context_provider)),
|
| vsync_manager_(vsync_manager),
|
| - synthetic_begin_frame_source_(begin_frame_source),
|
| - reflector_(nullptr) {
|
| -}
|
| + reflector_(nullptr) {}
|
|
|
| BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
|
| if (reflector_)
|
| @@ -64,7 +57,6 @@ void BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu(
|
| // TODO(brianderson): We should not be receiving 0 intervals.
|
| interval = cc::BeginFrameArgs::DefaultInterval();
|
| }
|
| - synthetic_begin_frame_source_->OnUpdateVSyncParameters(timebase, interval);
|
| vsync_manager_->UpdateVSyncParameters(timebase, interval);
|
| }
|
|
|
|
|