Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/view_tree_impl.cc

Index: components/view_manager/view_tree_impl.cc
diff --git a/components/view_manager/view_tree_impl.cc b/components/view_manager/view_tree_impl.cc
index f73f4a166c8e7b46c9658a8fdd278915263caabd..42e325c49b88161b0cf8642a996453983eff9126 100644
--- a/components/view_manager/view_tree_impl.cc
+++ b/components/view_manager/view_tree_impl.cc
@@ -652,20 +652,6 @@ void ViewTreeImpl::GetViewTree(
   callback.Run(ViewsToViewDatas(views));
 }
 
-void ViewTreeImpl::SetViewSurfaceId(
-    Id view_id,
-    mojo::SurfaceIdPtr surface_id,
-    const Callback<void(bool)>& callback) {
-  // TODO(sky): add coverage of not being able to set for random node.
-  ServerView* view = GetView(ViewIdFromTransportId(view_id));
-  if (!view || !access_policy_->CanSetViewSurfaceId(view)) {
-    callback.Run(false);
-    return;
-  }
-  view->SetSurfaceId(surface_id.To<cc::SurfaceId>());
-  callback.Run(true);
-}
-
 void ViewTreeImpl::SetViewBounds(
     Id view_id,
     mojo::RectPtr bounds,
@@ -707,6 +693,17 @@ void ViewTreeImpl::SetViewProperty(
   callback.Run(success);
 }
 
+void ViewTreeImpl::RequestSurface(
+    mojo::Id view_id,
+    mojo::InterfaceRequest<mojo::Surface> surface,
+    mojo::SurfaceClientPtr client) {
+  ServerView* view = GetView(ViewIdFromTransportId(view_id));

[sky, 2015/08/26 22:58:03]

You'll want to reset the surface/client if this is an embed root and the call is
from the embedded connection. Feel free to add a todo and come back to this as
we weren't doing it for the id previously.

[Fady Samuel, 2015/08/26 23:51:01]

Done.

+  const bool success = view && access_policy_->CanSetViewSurfaceId(view);
+  if (!success)
+    return;
+  view->Bind(surface.Pass(), client.Pass());
+}
+
 void ViewTreeImpl::SetViewTextInputState(
     uint32_t view_id,
     mojo::TextInputStatePtr state) {