| 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 9e73923ab3a4ed93af7d66d20b17005f0e5a131e..3d3b6a2025c3eb11650ef0ae3836126f09efd1d5 100644
|
| --- a/content/browser/compositor/browser_compositor_output_surface.cc
|
| +++ b/content/browser/compositor/browser_compositor_output_surface.cc
|
| @@ -25,24 +25,21 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| cc::SyntheticBeginFrameSource* begin_frame_source,
|
| std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
|
| overlay_candidate_validator)
|
| - : OutputSurface(std::move(context_provider), nullptr, nullptr),
|
| + : 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);
|
| - Initialize();
|
| }
|
|
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| std::unique_ptr<cc::SoftwareOutputDevice> software_device,
|
| const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
|
| cc::SyntheticBeginFrameSource* begin_frame_source)
|
| - : OutputSurface(nullptr, nullptr, std::move(software_device)),
|
| + : OutputSurface(std::move(software_device)),
|
| vsync_manager_(vsync_manager),
|
| synthetic_begin_frame_source_(begin_frame_source),
|
| - reflector_(nullptr) {
|
| - Initialize();
|
| -}
|
| + reflector_(nullptr) {}
|
|
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
|
| @@ -52,7 +49,6 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| vsync_manager_(vsync_manager),
|
| synthetic_begin_frame_source_(begin_frame_source),
|
| reflector_(nullptr) {
|
| - Initialize();
|
| }
|
|
|
| BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
|
| @@ -61,10 +57,6 @@ BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
|
| DCHECK(!reflector_);
|
| }
|
|
|
| -void BrowserCompositorOutputSurface::Initialize() {
|
| - capabilities_.adjust_deadline_for_parent = false;
|
| -}
|
| -
|
| void BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu(
|
| base::TimeTicks timebase,
|
| base::TimeDelta interval) {
|
|
|