| Index: components/surfaces/display_impl.cc
|
| diff --git a/components/surfaces/display_impl.cc b/components/surfaces/display_impl.cc
|
| index 55eef4ed0bbcf05d6ab73dd0f674404fbd77d047..98a9f278d53c1330a335e133559441c1c20b22bc 100644
|
| --- a/components/surfaces/display_impl.cc
|
| +++ b/components/surfaces/display_impl.cc
|
| @@ -51,9 +51,13 @@ void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
|
| cc::RendererSettings settings;
|
| display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
|
| scheduler_->AddDisplay(display_.get());
|
| - display_->Initialize(make_scoped_ptr(
|
| - new surfaces::DirectOutputSurface(new surfaces::SurfacesContextProvider(
|
| - gles2_client.PassInterface().PassHandle()))));
|
| +
|
| + // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
|
| + cc::DisplayScheduler* null_display_scheduler = nullptr;
|
| + display_->Initialize(make_scoped_ptr(new surfaces::DirectOutputSurface(
|
| + new surfaces::SurfacesContextProvider(
|
| + gles2_client.PassInterface().PassHandle()))),
|
| + null_display_scheduler);
|
| display_->Resize(last_submitted_frame_size_);
|
|
|
| display_->SetSurfaceId(cc_id_, 1.f);
|
| @@ -94,15 +98,6 @@ void DisplayImpl::Draw() {
|
| pending_callback_.reset();
|
| }
|
|
|
| -void DisplayImpl::DisplayDamaged() {
|
| -}
|
| -
|
| -void DisplayImpl::DidSwapBuffers() {
|
| -}
|
| -
|
| -void DisplayImpl::DidSwapBuffersComplete() {
|
| -}
|
| -
|
| void DisplayImpl::CommitVSyncParameters(base::TimeTicks timebase,
|
| base::TimeDelta interval) {
|
| }
|
|
|