Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/connection_manager.cc

Index: components/view_manager/connection_manager.cc
diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
index ce8d32bab9db183345300b588eb29bd6814dc9e5..51642c331bd048fae75b1cba29f73b08ad341dd7 100644
--- a/components/view_manager/connection_manager.cc
+++ b/components/view_manager/connection_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "cc/output/compositor_frame.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/focus_controller.h"
@@ -17,12 +18,19 @@
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
+#include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 using mojo::ConnectionSpecificId;
 
 namespace view_manager {
 namespace {
 
+namespace {
+void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
+  callback.Run();
+}
+}
+
 // Creates a copy of |view|. The copied view has |delegate| as its delegate.
 // This does not recurse.
 ServerView* CloneView(const ServerView* view, ServerViewDelegate* delegate) {
@@ -111,8 +119,12 @@ ConnectionManager::ScopedChange::~ScopedChange() {
   connection_manager_->FinishChange();
 }
 
-ConnectionManager::ConnectionManager(ConnectionManagerDelegate* delegate)
+ConnectionManager::ConnectionManager(
+    ConnectionManagerDelegate* delegate,
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state)
     : delegate_(delegate),
+      surfaces_state_(surfaces_state),
+      surface_factory_(surfaces_state->manager(), this),
       next_connection_id_(1),
       next_root_id_(0),
       event_dispatcher_(this),
@@ -451,6 +463,11 @@ void ConnectionManager::ProcessViewDeleted(const ViewId& view) {
   }
 }
 
+void ConnectionManager::ReturnResources(
+    const cc::ReturnedResourceArray& resources) {
+  // TODO(fsamuel): Implement this.
+}
+
 void ConnectionManager::ProcessViewportMetricsChanged(
     const mojo::ViewportMetrics& old_metrics,
     const mojo::ViewportMetrics& new_metrics) {
@@ -498,6 +515,36 @@ ViewManagerRootImpl* ConnectionManager::GetViewManagerRootByView(
   return nullptr;
 }
 
+void ConnectionManager::SubmitFrame(ServerView* view,
+                                    mojo::CompositorFramePtr frame,
+                                    const mojo::Closure& callback) {
+  if (view->surface_id().is_null()) {
+    // TODO(fsamuel): This is a hack. Do something sensible.
+    cc::SurfaceId surface_id(
+      (static_cast<uint64_t>(surfaces_state_->next_id_namespace()) << 32) |
+         view->id().view_id);
+    surface_factory_.Create(surface_id);
+    view->SetSurfaceId(surface_id);
+  } else {
+    gfx::Size frame_size =
+        frame->passes[0]->output_rect.To<gfx::Rect>().size();
+    if (frame_size != view->last_submitted_frame_size()) {
+      surface_factory_.Destroy(view->surface_id());
+      // Allocated a new Surface ID that is incremented by one.
+      cc::SurfaceId surface_id(view->surface_id());
+      surface_id = cc::SurfaceId((surface_id.id & 0xffffffff00000000) |
+          ((surface_id.id & 0x00000000ffffffff) + 1));
+      surface_factory_.Create(surface_id);
+      view->SetSurfaceId(surface_id);
+    }
+  }
+
+  surface_factory_.SubmitFrame(view->surface_id(),
+                               frame.To<scoped_ptr<cc::CompositorFrame>>(),
+                               base::Bind(&CallCallback, callback));
+  surfaces_state_->scheduler()->SetNeedsDraw();
+}
+
 void ConnectionManager::PrepareToDestroyView(ServerView* view) {
   if (!in_destructor_ && IsViewAttachedToRoot(view) &&
       view->id() != ClonedViewId()) {