cc: Make OutputSurface::BindToClient pure virtual and not return bool

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"
@@ skipping 15 matching lines @@
     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);
+  ui_compositor_frame_sink_->BindToClient(this);
 }
 
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
   const gfx::Rect bounds(ui_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.
@@ skipping 56 matching lines @@
   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.delegated_frame_data->render_pass_list.push_back(std::move(pass));
   ui_compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
   return;
 }
 
-bool MusBrowserCompositorOutputSurface::BindToClient(
-    cc::OutputSurfaceClient* client) {
-  if (!GpuBrowserCompositorOutputSurface::BindToClient(client))
-    return false;
-  ui_compositor_frame_sink_->BindToClient(this);
-  return true;
-}
-
 void MusBrowserCompositorOutputSurface::SetBeginFrameSource(
     cc::BeginFrameSource* source) {}
 
 void MusBrowserCompositorOutputSurface::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
     DCHECK_EQ(1, resource.count);
     const gpu::Mailbox& mailbox = GetMailboxFromResourceId(resource.id);
     GetCommandBufferProxy()->ReturnFrontBuffer(mailbox, resource.sync_token,
                                                resource.lost);
@@ skipping 45 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