Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/server_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/server_view.h"
 
 #include <inttypes.h>
 
 #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),
       visible_(false),
       opacity_(1),
       allows_reembed_(false),
       // 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.
 }
 
 ServerView::~ServerView() {
   delegate_->PrepareToDestroyView(this);
   FOR_EACH_OBSERVER(ServerViewObserver, observers_, OnWillDestroyView(this));
 
   while (!children_.empty())
     children_.front()->parent()->Remove(children_.front());
 
   if (parent_)
     parent_->Remove(this);
 
   FOR_EACH_OBSERVER(ServerViewObserver, observers_, OnViewDestroyed(this));
 }
 
 void ServerView::AddObserver(ServerViewObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 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);
   DCHECK(child != this);
   DCHECK(!child->Contains(this));
   if (child->parent() == this) {
     if (children_.size() == 1)
       return;  // Already in the right position.
     Reorder(child, children_.back(), mojo::ORDER_DIRECTION_ABOVE);
     return;
@@ skipping 150 matching lines @@
   while (view && view != root && view->visible())
     view = view->parent();
   return root == view;
 }
 
 void ServerView::SetSurfaceId(cc::SurfaceId surface_id) {
   surface_id_ = 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;
   BuildDebugInfo(std::string(), &result);
   return result;
 }
 
 void ServerView::BuildDebugInfo(const std::string& depth,
                                 std::string* result) const {
   *result += base::StringPrintf(
       "%sid=%d,%d visible=%s bounds=%d,%d %dx%d surface_id=%" PRIu64 "\n",
       depth.c_str(), static_cast<int>(id_.connection_id),
       static_cast<int>(id_.view_id), visible_ ? "true" : "false", bounds_.x(),
       bounds_.y(), bounds_.width(), bounds_.height(), surface_id_.id);
   for (const ServerView* child : children_)
     child->BuildDebugInfo(depth + "  ", result);
 }
 #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));
 }
 
 }  // namespace view_manager