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

Unified Diff: components/surfaces/display_impl.cc

Issue 1012853003: Add DisplayScheduler for Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo again Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: components/surfaces/display_impl.cc
diff --git a/components/surfaces/display_impl.cc b/components/surfaces/display_impl.cc
index 15319159a8b7d293b33ca8653f3c3fb84587c5d1..cef28e67c2afa7ae3bf2691034fe5d14b3775577 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());
+
+ // 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()))));
+ 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) {
}

Powered by Google App Engine
This is Rietveld 408576698