Mandoline: Allow submitting CompositorFrames directly to mojo::Views

mojo/cc/output_surface_mojo.cc

Index: mojo/cc/output_surface_mojo.cc
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc
index 5dbdde11dd4eb9dc57bb0e84ad4daa259bc37acb..6b567ec270d179f22ce1050eb695959de46bc223 100644
--- a/mojo/cc/output_surface_mojo.cc
+++ b/mojo/cc/output_surface_mojo.cc
@@ -7,20 +7,15 @@
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace mojo {
 
 OutputSurfaceMojo::OutputSurfaceMojo(
-    OutputSurfaceMojoClient* client,
     const scoped_refptr<cc::ContextProvider>& context_provider,
-    ScopedMessagePipeHandle surface_handle)
+    InterfacePtrInfo<CompositorFrameReceiver> receiver_info)
     : cc::OutputSurface(context_provider),
-      output_surface_mojo_client_(client),
-      surface_handle_(surface_handle.Pass()),
-      id_namespace_(0u),
-      local_id_(0u) {
+      receiver_info_(receiver_info.Pass()) {
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
 }
@@ -28,42 +23,15 @@ OutputSurfaceMojo::OutputSurfaceMojo(
 OutputSurfaceMojo::~OutputSurfaceMojo() {
 }
 
-void OutputSurfaceMojo::SetIdNamespace(uint32_t id_namespace) {
-  id_namespace_ = id_namespace;
-  if (local_id_) {
-    cc::SurfaceId qualified_id(static_cast<uint64_t>(id_namespace_) << 32 |
-                               local_id_);
-    output_surface_mojo_client_->DidCreateSurface(qualified_id);
-  }
-}
-
 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) {
-  surface_.Bind(InterfacePtrInfo<Surface>(surface_handle_.Pass(), 0u));
-  surface_->GetIdNamespace(
-      base::Bind(&OutputSurfaceMojo::SetIdNamespace, base::Unretained(this)));
+  receiver_.Bind(receiver_info_.Pass());
   return cc::OutputSurface::BindToClient(client);
 }
 
 void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) {
-  gfx::Size frame_size =
-      frame->delegated_frame_data->render_pass_list.back()->output_rect.size();
-  if (frame_size != surface_size_) {
-    if (local_id_ != 0u) {
-      surface_->DestroySurface(local_id_);
-    }
-    local_id_++;
-    surface_->CreateSurface(local_id_);
-    if (id_namespace_) {
-      cc::SurfaceId qualified_id(static_cast<uint64_t>(id_namespace_) << 32 |
-                                 local_id_);
-      output_surface_mojo_client_->DidCreateSurface(qualified_id);
-    }
-    surface_size_ = frame_size;
-  }
-
-  surface_->SubmitFrame(local_id_,
-                        CompositorFrame::From(*frame),
-                        mojo::Closure());
+  // TODO(fsamuel, rjkroege): We should probably throttle compositor frames.
+  receiver_->SubmitCompositorFrame(CompositorFrame::From(*frame),
+                                   Closure());
 
   client_->DidSwapBuffers();
   client_->DidSwapBuffersComplete();