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

Unified Diff: sky/viewer/document_view.cc

Issue 807733002: Split surface id and simplify connecting to surfaces service (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« services/surfaces/surfaces_impl.cc ('K') | « sky/compositor/surface_holder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/document_view.cc
diff --git a/sky/viewer/document_view.cc b/sky/viewer/document_view.cc
index 722a935ebe915a0fe9b56cf0a6e8cd72641ef39e..47ab3e3540e1815ccd4885ad32c60d1d0f8266ab 100644
--- a/sky/viewer/document_view.cc
+++ b/sky/viewer/document_view.cc
@@ -156,7 +156,8 @@ void DocumentView::BeginFrame(base::TimeTicks frame_time) {
}
void DocumentView::OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) {
- root_->SetSurfaceId(surface_id.Pass());
+ if (root_)
jamesr 2014/12/16 00:02:47 this is not directly related, but fixes a flaky sh
esprehn 2014/12/16 00:51:11 Wouldn't we want to shutdown the connection to sur
jamesr 2014/12/16 00:56:09 This isn't about controlling the surface, this is
esprehn 2014/12/16 01:23:57 Why do we even get this message if everything is t
+ root_->SetSurfaceId(surface_id.Pass());
}
void DocumentView::PaintContents(SkCanvas* canvas, const gfx::Rect& clip) {
« services/surfaces/surfaces_impl.cc ('K') | « sky/compositor/surface_holder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698