Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/server_view.cc

Index: components/view_manager/server_view.cc
diff --git a/components/view_manager/server_view.cc b/components/view_manager/server_view.cc
index 411e0f90add0b237aef8ffe83ae66c9afa03322b..3f133f9452d42af936b1aabe58f462bd03d31789 100644
--- a/components/view_manager/server_view.cc
+++ b/components/view_manager/server_view.cc
@@ -9,10 +9,20 @@
 #include "base/strings/stringprintf.h"
 #include "components/view_manager/server_view_delegate.h"
 #include "components/view_manager/server_view_observer.h"
+#include "components/view_manager/surfaces/surfaces_state.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace view_manager {
 
-ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id)
+namespace {
+void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
+  callback.Run();
+}
+}

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

nit:  // namespace

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

Done.

+
+ServerView::ServerView(ServerViewDelegate* delegate,
+                       const ViewId& id)
     : delegate_(delegate),
       id_(id),
       parent_(nullptr),
@@ -22,7 +32,8 @@ ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id)
       // Don't notify newly added observers during notification. This causes
       // problems for code that adds an observer as part of an observer
       // notification (such as ServerViewDrawTracker).
-      observers_(base::ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY) {
+      observers_(base::ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY),
+      binding_(this) {
   DCHECK(delegate);  // Must provide a delegate.
 }
 
@@ -47,6 +58,12 @@ void ServerView::RemoveObserver(ServerViewObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+void ServerView::Bind(mojo::InterfaceRequest<Surface> request,
+                      mojo::SurfaceClientPtr client) {
+  binding_.Bind(request.Pass());
+  client_ = client.Pass();
+}
+
 void ServerView::Add(ServerView* child) {
   // We assume validation checks happened already.
   DCHECK(child);
@@ -217,6 +234,46 @@ void ServerView::SetSurfaceId(cc::SurfaceId surface_id) {
   delegate_->OnScheduleViewPaint(this);
 }
 
+void ServerView::SubmitCompositorFrame(
+    mojo::CompositorFramePtr frame,
+    const SubmitCompositorFrameCallback& callback) {
+  gfx::Size frame_size = frame->passes[0]->output_rect.To<gfx::Rect>().size();
+  //delegate_->SubmitCompositorFrame(this, frame.Pass(), callback);

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

?

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

Moving some code around and missed this. Deleted.

+  // Create Surfaces state on demand.
+  if (!surface_factory_) {
+    surface_factory_.reset(
+        new cc::SurfaceFactory(delegate_->GetSurfacesState()->manager(), this));
+  }
+  if (!surface_id_allocator_) {
+    surface_id_allocator_.reset(
+        new cc::SurfaceIdAllocator(
+            delegate_->GetSurfacesState()->next_id_namespace()));
+  }
+  if (surface_id().is_null()) {
+    // Create a Surface ID for the first time for this view.
+    cc::SurfaceId surface_id(surface_id_allocator_->GenerateId());
+    surface_factory_->Create(surface_id);
+    SetSurfaceId(surface_id);
+  } else {
+    // If the size of the CompostiorFrame has changed then destroy the existing
+    // Surface and create a new one of the appropriate size.
+    gfx::Size frame_size =

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

Don't you hvae this defined on 240 already?

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

Removed

+        frame->passes[0]->output_rect.To<gfx::Rect>().size();
+    if (frame_size != last_submitted_frame_size()) {
+      surface_factory_->Destroy(surface_id());
+      cc::SurfaceId surface_id(surface_id_allocator_->GenerateId());
+      surface_factory_->Create(surface_id);
+      SetSurfaceId(surface_id);
+    }
+  }
+  surface_factory_->SubmitCompositorFrame(
+      surface_id(),
+      frame.To<scoped_ptr<cc::CompositorFrame>>(),
+      base::Bind(&CallCallback, callback));
+  delegate_->GetSurfacesState()->scheduler()->SetNeedsDraw();
+  last_submitted_frame_size_ = frame_size;

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

This is only needed @ 266 and 256ish, right?

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

Yes. We keep track of the last frame's size, so we know whether or not to create
a new surface.

+}
+
 #if !defined(NDEBUG)
 std::string ServerView::GetDebugWindowHierarchy() const {
   std::string result;
@@ -236,6 +293,12 @@ void ServerView::BuildDebugInfo(const std::string& depth,
 }
 #endif
 
+void ServerView::ReturnResources(
+    const cc::ReturnedResourceArray& resources) {
+  client_->ReturnResources(
+      mojo::Array<mojo::ReturnedResourcePtr>::From(resources));
+}
+
 void ServerView::RemoveImpl(ServerView* view) {
   view->parent_ = NULL;
   children_.erase(std::find(children_.begin(), children_.end(), view));