Enabling Aura-Mus clients to submit frames to Mus.

content/browser/compositor/mus_browser_compositor_output_surface.cc

 // Copyright 2016 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 "content/browser/compositor/mus_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
+#include "ui/aura/mus/window_compositor_frame_sink.h"
+#include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/window.h"
 
 namespace content {
 
 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
     ui::Window* window,
     scoped_refptr<ContextProviderCommandBuffer> context,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
     cc::SyntheticBeginFrameSource* begin_frame_source,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : GpuBrowserCompositorOutputSurface(std::move(context),
                                         std::move(vsync_manager),
                                         begin_frame_source,
                                         std::move(overlay_candidate_validator)),
       ui_window_(window) {
   ui_compositor_frame_sink_ = ui_window_->RequestCompositorFrameSink(
       ui::mojom::CompositorFrameSinkType::DEFAULT, context,
       gpu_memory_buffer_manager);
   ui_compositor_frame_sink_->BindToClient(this);
 }
 
+MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
+    aura::Window* window,
+    scoped_refptr<ContextProviderCommandBuffer> context,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
+    cc::SyntheticBeginFrameSource* begin_frame_source,
+    std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+        overlay_candidate_validator)
+    : GpuBrowserCompositorOutputSurface(std::move(context),
+                                        std::move(vsync_manager),
+                                        begin_frame_source,
+                                        std::move(overlay_candidate_validator)),
+      window_(window) {
+  aura::WindowPortMus* window_port = aura::WindowPortMus::Get(window_);
+  DCHECK(window_port);
+  compositor_frame_sink_ = window_port->RequestCompositorFrameSink(
+      ui::mojom::CompositorFrameSinkType::DEFAULT, context,
+      gpu_memory_buffer_manager);
+  compositor_frame_sink_->BindToClient(this);
+}
+
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
-  const gfx::Rect bounds(ui_window_->bounds().size());
+  const gfx::Rect bounds = ui_window_ ? gfx::Rect(ui_window_->bounds().size())
+                                      : gfx::Rect(window_->bounds().size());
   cc::CompositorFrame ui_frame;
   ui_frame.metadata.latency_info = std::move(frame.latency_info);
   // Reset latency_info to known empty state after moving contents.
   frame.latency_info.clear();
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   const bool has_transparent_background = true;
   pass->SetAll(render_pass_id, bounds, bounds, gfx::Transform(),
                has_transparent_background);
   // The SharedQuadState is owned by the SharedQuadStateList
@@ skipping 44 matching lines @@
   const bool secure_output_only = false;
 
   cc::TextureDrawQuad* quad =
       pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
   quad->SetAll(sqs, rect, rect, rect, needs_blending, resource.id, gfx::Size(),
                premultiplied_alpha, uv_top_left, uv_bottom_right,
                background_color, vertex_opacity, y_flipped, nearest_neighbor,
                secure_output_only);
 
   ui_frame.render_pass_list.push_back(std::move(pass));
-  ui_compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
+
+  // TODO(mfomitchev): Remove ui_compositor_frame_sink_ once we complete the
+  // switch to Aura-Mus.
+  if (ui_compositor_frame_sink_)
+    ui_compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
+  else
+    compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
   return;
 }
 
 void MusBrowserCompositorOutputSurface::SetBeginFrameSource(
     cc::BeginFrameSource* source) {}
 
 void MusBrowserCompositorOutputSurface::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
     DCHECK_EQ(1, resource.count);
@@ skipping 48 matching lines @@
 
 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
     uint32_t id) {
   DCHECK_LT(id, mailboxes_.size());
   DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
          free_resource_ids_.end());
   return mailboxes_[id];
 }
 
 }  // namespace content