Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/public/cpp/lib/view.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/view.h"
 
 #include <set>
 #include <string>
 
 #include "components/view_manager/public/cpp/lib/view_private.h"
 #include "components/view_manager/public/cpp/lib/view_tree_client_impl.h"
 #include "components/view_manager/public/cpp/view_observer.h"
+#include "components/view_manager/public/cpp/view_surface.h"
 #include "components/view_manager/public/cpp/view_tracker.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 
 namespace {
 
 void NotifyViewTreeChangeAtReceiver(
     View* receiver,
     const ViewObserver::TreeChangeParams& params,
@@ skipping 193 matching lines @@
 
 void View::SetVisible(bool value) {
   if (visible_ == value)
     return;
 
   if (connection_)
     static_cast<ViewTreeClientImpl*>(connection_)->SetVisible(id_, value);
   LocalSetVisible(value);
 }
 
+scoped_ptr<mojo::ViewSurface> View::RequestSurface() {
+  mojo::SurfacePtr surface;
+  mojo::SurfaceClientPtr client;
+  mojo::InterfaceRequest<SurfaceClient> client_request = GetProxy(&client);
+  static_cast<ViewTreeClientImpl*>(connection_)->RequestSurface(
+      id_, GetProxy(&surface), client.Pass());
+  return make_scoped_ptr(new mojo::ViewSurface(surface.PassInterface(),
+                                               client_request.Pass()));
+}
+
 void View::SetSharedProperty(const std::string& name,
                              const std::vector<uint8_t>* value) {
   std::vector<uint8_t> old_value;
   std::vector<uint8_t>* old_value_ptr = nullptr;
   auto it = properties_.find(name);
   if (it != properties_.end()) {
     old_value = it->second;
     old_value_ptr = &old_value;
 
     if (value && old_value == *value)
@@ skipping 111 matching lines @@
   // TODO(beng): this could be improved depending on how we decide to own views.
   Children::const_iterator it = children_.begin();
   for (; it != children_.end(); ++it) {
     View* view = (*it)->GetChildById(id);
     if (view)
       return view;
   }
   return NULL;
 }
 
-void View::SetSurfaceId(SurfaceIdPtr id) {
-  if (connection_) {
-    static_cast<ViewTreeClientImpl*>(connection_)->SetSurfaceId(id_, id.Pass());
-  }
-}
-
 void View::SetTextInputState(TextInputStatePtr state) {
   if (connection_) {
     static_cast<ViewTreeClientImpl*>(connection_)
         ->SetViewTextInputState(id_, state.Pass());
   }
 }
 
 void View::SetImeVisibility(bool visible, TextInputStatePtr state) {
   // SetImeVisibility() shouldn't be used if the view is not editable.
   DCHECK(state.is_null() || state->type != TEXT_INPUT_TYPE_NONE);
@@ skipping 230 matching lines @@
       !static_cast<ViewTreeClientImpl*>(connection_)->is_embed_root()) {
     return false;
   }
 
   while (!children_.empty())
     RemoveChild(children_[0]);
   return true;
 }
 
 }  // namespace mojo