| Index: components/surfaces/display_impl.cc
|
| diff --git a/components/surfaces/display_impl.cc b/components/surfaces/display_impl.cc
|
| index 15319159a8b7d293b33ca8653f3c3fb84587c5d1..09eeb7f9dee48328940c7e4046aea3f2809a9386 100644
|
| --- a/components/surfaces/display_impl.cc
|
| +++ b/components/surfaces/display_impl.cc
|
| @@ -46,8 +46,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 mojo::DirectOutputSurface(
|
| - new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))));
|
| +
|
| + // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
|
| + cc::DisplayScheduler* null_display_scheduler = nullptr;
|
| + display_->Initialize(
|
| + make_scoped_ptr(new mojo::DirectOutputSurface(
|
| + new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))),
|
| + null_display_scheduler);
|
|
|
| factory_.Create(cc_id_);
|
| display_->SetSurfaceId(cc_id_, 1.f);
|
| @@ -82,15 +87,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) {
|
| }
|
|
|