mus: Remove the old client lib.

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 "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.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"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace content {
 
 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
-    ui::Window* window,
-    scoped_refptr<ui::ContextProviderCommandBuffer> context,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-    const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
-    std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
-        overlay_candidate_validator)
-    : GpuBrowserCompositorOutputSurface(std::move(context),
-                                        update_vsync_parameters_callback,
-                                        std::move(overlay_candidate_validator),
-                                        false /* support_stencil */),
-      ui_window_(window),
-      window_(nullptr),
-      begin_frame_source_(nullptr) {
-  ui_compositor_frame_sink_ = ui_window_->RequestCompositorFrameSink(
-      context, gpu_memory_buffer_manager);
-  ui_compositor_frame_sink_->BindToClient(this);
-}
-
-MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
     aura::Window* window,
     scoped_refptr<ui::ContextProviderCommandBuffer> context,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : GpuBrowserCompositorOutputSurface(std::move(context),
                                         update_vsync_parameters_callback,
                                         std::move(overlay_candidate_validator),
                                         false  /* support_stencil */),
-      ui_window_(nullptr),
       window_(window),
       begin_frame_source_(nullptr) {
   aura::WindowPortMus* window_port = aura::WindowPortMus::Get(window_);
   DCHECK(window_port);
   compositor_frame_sink_ = window_port->RequestCompositorFrameSink(
       context, gpu_memory_buffer_manager);
   compositor_frame_sink_->BindToClient(this);
 }
 
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 cc::BeginFrameSource* MusBrowserCompositorOutputSurface::GetBeginFrameSource() {
   return begin_frame_source_;
 }
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
   cc::CompositorFrame ui_frame;
   ui_frame.metadata.device_scale_factor = display::Screen::GetScreen()
                                               ->GetDisplayNearestWindow(window_)
                                               .device_scale_factor();
   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 int render_pass_id = 1;
-  const gfx::Rect bounds_in_dip = ui_window_
-                                      ? gfx::Rect(ui_window_->bounds().size())
-                                      : gfx::Rect(window_->bounds().size());
+  const gfx::Rect bounds_in_dip = gfx::Rect(window_->bounds().size());
   const gfx::Rect bounds_in_pixels = gfx::ConvertRectToPixel(
       ui_frame.metadata.device_scale_factor, bounds_in_dip);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   pass->SetNew(render_pass_id, bounds_in_pixels, bounds_in_pixels,
                gfx::Transform());
   // The SharedQuadState is owned by the SharedQuadStateList
   // shared_quad_state_list.
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->SetAll(gfx::Transform(), bounds_in_pixels.size(), bounds_in_pixels,
               bounds_in_pixels, false /* is_clipped */, 1.f /* opacity */,
@@ skipping 41 matching lines @@
 
   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));
 
-  // 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;
+  compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
 }
 
 void MusBrowserCompositorOutputSurface::SetBeginFrameSource(
     cc::BeginFrameSource* source) {
   begin_frame_source_ = source;
 }
 
 void MusBrowserCompositorOutputSurface::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
@@ skipping 49 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