Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/public/cpp/lib/view_tree_client_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/public/cpp/lib/view_tree_client_impl.h"
 
 #include "components/view_manager/public/cpp/lib/view_private.h"
 #include "components/view_manager/public/cpp/util.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "components/view_manager/public/cpp/view_tree_connection.h"
@@ skipping 128 matching lines @@
 
 bool ViewTreeClientImpl::OwnsView(Id id) const {
   return HiWord(id) == connection_id_;
 }
 
 void ViewTreeClientImpl::SetBounds(Id view_id, const Rect& bounds) {
   DCHECK(tree_);
   tree_->SetViewBounds(view_id, bounds.Clone(), ActionCompletedCallback());
 }
 
-void ViewTreeClientImpl::SetSurfaceId(Id view_id, SurfaceIdPtr surface_id) {
-  DCHECK(tree_);
-  if (surface_id.is_null())
-    return;
-  tree_->SetViewSurfaceId(
-      view_id, surface_id.Pass(), ActionCompletedCallback());
-}
-
 void ViewTreeClientImpl::SetFocus(Id view_id) {
   // In order for us to get here we had to have exposed a view, which implies we
   // got a connection.
   DCHECK(tree_);
   tree_->SetFocus(view_id, ActionCompletedCallback());
 }
 
 void ViewTreeClientImpl::SetVisible(Id view_id, bool visible) {
   DCHECK(tree_);
   tree_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
@@ skipping 28 matching lines @@
   tree_->Embed(view_id, client.Pass(), ActionCompletedCallback());
 }
 
 void ViewTreeClientImpl::EmbedAllowingReembed(mojo::URLRequestPtr request,
                                               Id view_id) {
   DCHECK(tree_);
   tree_->EmbedAllowingReembed(view_id, request.Pass(),
                               ActionCompletedCallback());
 }
 
+void ViewTreeClientImpl::RequestSurface(Id view_id,
+                                        InterfaceRequest<Surface> surface,
+                                        SurfaceClientPtr client) {
+  DCHECK(tree_);
+  tree_->RequestSurface(view_id, surface.Pass(), client.Pass());
+}
+
 void ViewTreeClientImpl::AddView(View* view) {
   DCHECK(views_.find(view->id()) == views_.end());
   views_[view->id()] = view;
 }
 
 void ViewTreeClientImpl::RemoveView(Id view_id) {
   if (focused_view_ && focused_view_->id() == view_id)
     OnViewFocused(0);
 
   IdToViewMap::iterator it = views_.find(view_id);
@@ skipping 227 matching lines @@
 void ViewTreeClientImpl::OnActionCompleted(bool success) {
   if (!change_acked_callback_.is_null())
     change_acked_callback_.Run();
 }
 
 Callback<void(bool)> ViewTreeClientImpl::ActionCompletedCallback() {
   return [this](bool success) { OnActionCompleted(success); };
 }
 
 }  // namespace mojo