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

services/ui/ws/frame_generator.h

 // 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.
 
 #ifndef SERVICES_UI_WS_FRAME_GENERATOR_H_
 #define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
+#include "cc/surfaces/frame_sink_id.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
 class RenderPass;
 }
 
 namespace gpu {
@@ skipping 57 matching lines @@
   // DrawWindowTree recursively visits ServerWindows, creating a SurfaceDrawQuad
   // for each that lacks one.
   void DrawWindowTree(cc::RenderPass* pass,
                       ServerWindow* window,
                       const gfx::Vector2d& parent_to_root_origin_offset,
                       float opacity,
                       bool* may_contain_video) const;
 
   FrameGeneratorDelegate* delegate_;
   scoped_refptr<DisplayCompositor> display_compositor_;
+  cc::FrameSinkId frame_sink_id_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   std::unique_ptr<surfaces::CompositorFrameSink> compositor_frame_sink_;
   gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   // The region that needs to be redrawn next time the compositor frame is
   // generated.
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_ = false;
   bool may_contain_video_ = false;
 
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_