Mus+Ash: Unified BeginFrame Skeleton

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>
 
@@ skipping 42 matching lines @@
  public:
   FrameGenerator(FrameGeneratorDelegate* delegate, ServerWindow* root_window);
   ~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);
 
-  bool is_frame_pending() { return frame_pending_; }
-
  private:
   friend class ui::ws::test::FrameGeneratorTest;
 
   // cc::mojom::MojoCompositorFrameSinkClient implementation:
   void DidReceiveCompositorFrameAck() override;
+  void OnBeginFrame(const cc::BeginFrameArgs& begin_frame_arags) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
 
-  void WantToDraw();
-
-  // This method initiates a top level redraw of the display.
-  // TODO(fsamuel): In polliwog, this only gets called when the window manager
-  // changes.
-  void Draw();
-
-  // Generates the CompositorFrame for the current |dirty_rect_|.
+  // Generates the CompositorFrame.
   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);
 
   // Adds a reference to the current cc::Surface of the provided
@@ skipping 25 matching lines @@
 
   FrameGeneratorDelegate* delegate_;
   cc::FrameSinkId frame_sink_id_;
   ServerWindow* const root_window_;
   cc::SurfaceSequenceGenerator surface_sequence_generator_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   cc::mojom::MojoCompositorFrameSinkPtr 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;
   struct SurfaceDependency {
     cc::LocalFrameId local_frame_id;
     cc::SurfaceSequence sequence;
   };
   std::unordered_map<cc::FrameSinkId, SurfaceDependency, cc::FrameSinkIdHash>
       dependencies_;
 
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> binding_;
 
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_