Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/view_tree_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/view_manager/view_tree_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/default_access_policy.h"
@@ skipping 634 matching lines @@
 }
 
 void ViewTreeImpl::GetViewTree(
     Id view_id,
     const Callback<void(Array<ViewDataPtr>)>& callback) {
   std::vector<const ServerView*> views(
       GetViewTree(ViewIdFromTransportId(view_id)));
   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,
     const Callback<void(bool)>& callback) {
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
   const bool success = view && access_policy_->CanSetViewBounds(view);
   if (success) {
     ConnectionManager::ScopedChange change(this, connection_manager_, false);
     view->SetBounds(bounds.To<gfx::Rect>());
   }
@@ skipping 21 matching lines @@
     if (value.is_null()) {
       view->SetProperty(name, nullptr);
     } else {
       std::vector<uint8_t> data = value.To<std::vector<uint8_t>>();
       view->SetProperty(name, &data);
     }
   }
   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) {
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
   bool success = view && access_policy_->CanSetViewTextInputState(view);
   if (success)
     view->SetTextInputState(state.To<ui::TextInputState>());
 }
 
 void ViewTreeImpl::SetImeVisibility(uint32_t view_id,
@@ skipping 50 matching lines @@
   ViewTreeImpl* connection =
       connection_manager_->GetConnectionWithRoot(view->id());
   return connection && connection != this;
 }
 
 bool ViewTreeImpl::IsDescendantOfEmbedRoot(const ServerView* view) {
   return is_embed_root_ && root_ && GetView(*root_)->Contains(view);
 }
 
 }  // namespace view_manager