Mus+Ash: Use standard cc mechanism for surface lifetime.

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/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;
 }
 
 namespace gpu {
 class GpuChannelHost;
 }
 
 namespace ui {
 
 namespace surfaces {
 class CompositorFrameSink;
 }
 
 class DisplayCompositor;
 
 namespace ws {
 
 namespace test {
 class FrameGeneratorTest;
 }
 
 class FrameGeneratorDelegate;
 class ServerWindow;
+class ServerWindowSurface;
 
 // Responsible for redrawing the display in response to the redraw requests by
 // submitting CompositorFrames to the owned CompositorFrameSink.
-class FrameGenerator {
+class FrameGenerator : public ServerWindowObserver {
  public:
   FrameGenerator(FrameGeneratorDelegate* delegate,
                  scoped_refptr<DisplayCompositor> display_compositor);
-  virtual ~FrameGenerator();
+  ~FrameGenerator() override;
 
   void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
 
   // Schedules a redraw for the provided region.
   void RequestRedraw(const gfx::Rect& redraw_region);
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request);
 
   bool is_frame_pending() { return frame_pending_; }
 
  private:
   friend class ui::ws::test::FrameGeneratorTest;
 
   void WantToDraw();
 
   // This method initiates a top level redraw of the display.
   // TODO(fsamuel): This should use vblank as a signal rather than a timer
   // http://crbug.com/533042
   void Draw();

[rjkroege, 2016/10/07 19:34:50]

there's something not right about this comment? Or the code. You told me that
there was no need to submit new compositor frames from FrameGenerator unless the
wm changes?

[Fady Samuel, 2016/10/07 20:31:33]

We're not there yet. That's once all my code and Sadrul's code lands.

[rjkroege, 2016/10/07 20:48:13]

please update the TODO for the brave polliwog world

 
   // This is called after the CompositorFrameSink has completed generating a new
   // frame for the display. TODO(fsamuel): Idle time processing should happen
   // here if there is budget for it.
   void DidDraw();
 
   // Generates the CompositorFrame for the current |dirty_rect_|.
-  cc::CompositorFrame GenerateCompositorFrame(
-      const gfx::Rect& output_rect) const;
+  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) const;
+                      bool* may_contain_video);
+
+  // Adds a reference to the current cc::Surface of the provided
+  // |window_surface|. If an existing reference is held with a different
+  // LocalFrameId then release that reference first.

[rjkroege, 2016/10/07 19:34:50]

the arg is surface. not window_surface? Something needs to be corrected here?

[Fady Samuel, 2016/10/07 20:31:33]

Done.

+  void AddOrUpdateSurfaceReference(ServerWindowSurface* surface);

[rjkroege, 2016/10/07 19:34:50]

can you say why/when we should call this?

[Fady Samuel, 2016/10/07 20:31:33]

Done.

+
+  // Releases any retained references for the provided FrameSink.
+  void ReleaseFrameSinkReference(const cc::FrameSinkId& frame_sink_id);
+
+  // Releases all retained references to surfaces.
+  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<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;
+  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_