Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

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 <unordered_map>
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/local_frame_id.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surface_sequence_generator.h"
+#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
 class RenderPass;
 class SurfaceId;
 }
@@ skipping 48 matching lines @@
   void DidDraw();
 
   // Generates the CompositorFrame for the current |dirty_rect_|.
   cc::CompositorFrame GenerateCompositorFrame(const gfx::Rect& output_rect);
 
   // 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);
+                      float opacity);
 
   // Adds a reference to the current cc::Surface of the provided
   // |window_compositor_frame_sink|. If an existing reference is held with a
   // different LocalFrameId then release that reference first. This is called on
   // each ServerWindowCompositorFrameSink as FrameGenerator walks the window
   // tree to generate a CompositorFrame. This is done to make sure that the
   // window surfaces are retained for the entirety of the time between
   // submission of the top-level frame to drawing the frame to screen.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
-  void AddOrUpdateSurfaceReference(
-      ServerWindowCompositorFrameSink* window_compositor_frame_sink);
+  void AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType type,
+                                   ServerWindow* window);
 
   // Releases any retained references for the provided FrameSink.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
   void ReleaseFrameSinkReference(const cc::FrameSinkId& frame_sink_id);
 
   // Releases all retained references to surfaces.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
   void ReleaseAllSurfaceReferences();
 
   // ServerWindowObserver implementation.
   void OnWindowDestroying(ServerWindow* window) override;
 
   FrameGeneratorDelegate* delegate_;
   scoped_refptr<DisplayCompositor> display_compositor_;
   cc::FrameSinkId frame_sink_id_;
   cc::SurfaceSequenceGenerator surface_sequence_generator_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   std::unique_ptr<DisplayCompositorFrameSink> 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;
   struct SurfaceDependency {
     cc::LocalFrameId local_frame_id;
     cc::SurfaceSequence sequence;
   };
   std::unordered_map<cc::FrameSinkId, SurfaceDependency, cc::FrameSinkIdHash>
       dependencies_;
 
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_