Mus+Ash: Fix the FrameSinkId of the FrameGenerator's CompositorFrameSink

services/ui/ws/frame_generator.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 "services/ui/ws/frame_generator.h"
 
 #include "base/containers/adapters.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/surfaces/compositor_frame_sink.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_surface.h"
 #include "services/ui/ws/server_window_surface_manager.h"
 
 namespace ui {
 
 namespace ws {
 
 FrameGenerator::FrameGenerator(
     FrameGeneratorDelegate* delegate,
     scoped_refptr<DisplayCompositor> display_compositor)
     : delegate_(delegate),
       display_compositor_(display_compositor),
+      frame_sink_id_(0, display_compositor->GenerateNextClientId()),
       draw_timer_(false, false),
       weak_factory_(this) {
   DCHECK(delegate_);
 }
 
 FrameGenerator::~FrameGenerator() {
   // Invalidate WeakPtrs now to avoid callbacks back into the
   // FrameGenerator during destruction of |compositor_frame_sink_|.
   weak_factory_.InvalidateWeakPtrs();
   compositor_frame_sink_.reset();
 }
 
 void FrameGenerator::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> channel) {
   if (widget_ != gfx::kNullAcceleratedWidget) {
     compositor_frame_sink_ = base::MakeUnique<surfaces::CompositorFrameSink>(
-        base::ThreadTaskRunnerHandle::Get(), widget_, std::move(channel),
-        display_compositor_);
+        frame_sink_id_, base::ThreadTaskRunnerHandle::Get(), widget_,
+        std::move(channel), display_compositor_);
   } else {
     gpu_channel_ = std::move(channel);
   }
 }
 
 void FrameGenerator::RequestRedraw(const gfx::Rect& redraw_region) {
   dirty_rect_.Union(redraw_region);
   WantToDraw();
 }
 
 void FrameGenerator::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget) {
   widget_ = widget;
   if (gpu_channel_ && widget != gfx::kNullAcceleratedWidget) {
     compositor_frame_sink_.reset(new surfaces::CompositorFrameSink(
-        base::ThreadTaskRunnerHandle::Get(), widget_, std::move(gpu_channel_),
-        display_compositor_));
+        frame_sink_id_, base::ThreadTaskRunnerHandle::Get(), widget_,
+        std::move(gpu_channel_), display_compositor_));
   }
 }
 
 void FrameGenerator::RequestCopyOfOutput(
     std::unique_ptr<cc::CopyOutputRequest> output_request) {
   if (compositor_frame_sink_)
     compositor_frame_sink_->RequestCopyOfOutput(std::move(output_request));
 }
 
 void FrameGenerator::WantToDraw() {
@@ skipping 154 matching lines @@
                  gfx::Rect() /* opaque_rect */,
                  bounds_at_origin /* visible_rect */, true /* needs_blending*/,
                  underlay_surface->GetSurfaceId());
     DCHECK(!underlay_surface->may_contain_video());
   }
 }
 
 }  // namespace ws
 
 }  // namespace ui