Remove FrameGenerator::root_window_

services/ui/ws/frame_generator.h

Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/frame_generator.h b/services/ui/ws/frame_generator.h
index ea5887eaab1f8165024120430198ec5d2023a993..8706551f49446073432e15172830f6e904285840 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -28,15 +28,12 @@ class RenderPass;
 namespace ui {
 namespace ws {
 
-class ServerWindow;
-
 // Responsible for redrawing the display in response to the redraw requests by
 // submitting CompositorFrames to the owned CompositorFrameSink.
 class FrameGenerator : public cc::CompositorFrameSinkClient,
                        public cc::BeginFrameObserver {
  public:
   FrameGenerator(
-      ServerWindow* root_window,
       std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink);
   ~FrameGenerator() override;
 
@@ -47,6 +44,8 @@ class FrameGenerator : public cc::CompositorFrameSinkClient,
   void OnSurfaceCreated(const cc::SurfaceInfo& surface_info);
 
   void OnWindowDamaged();
+  void OnWindowVisibilityChanged(bool visible);
+  void OnWindowBoundsChanged(const gfx::Rect& bounds);
 
  private:
   // cc::CompositorFrameSinkClient implementation:
@@ -69,7 +68,7 @@ class FrameGenerator : public cc::CompositorFrameSinkClient,
   void OnBeginFrameSourcePausedChanged(bool paused) override;
 
   // Generates the CompositorFrame.
-  cc::CompositorFrame GenerateCompositorFrame(const gfx::Rect& output_rect);
+  cc::CompositorFrame GenerateCompositorFrame();
 
   // DrawWindow creates SurfaceDrawQuad for the window manager and appends it to
   // the provided cc::RenderPass.
@@ -79,8 +78,9 @@ class FrameGenerator : public cc::CompositorFrameSinkClient,
   // FrameGenerator as an observer to/from begin_frame_source_ accordingly.
   void SetNeedsBeginFrame(bool needs_begin_frame);
 
-  ServerWindow* const root_window_;
   float device_scale_factor_ = 1.f;
+  bool is_window_visible_;

[Fady Samuel, 2017/03/22 18:19:40]

is_window_visible_ = false;

[Alex Z., 2017/03/22 18:35:57]

Done.

+  gfx::Rect bounds_;
 
   std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink_;
   cc::BeginFrameArgs last_begin_frame_args_;