Factor draw functionality out of DefaultPlatformDisplay into FrameGenerator.

services/ui/ws/frame_generator.h

Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/platform_display.h b/services/ui/ws/frame_generator.h
similarity index 17%
copy from services/ui/ws/platform_display.h
copy to services/ui/ws/frame_generator.h
index 68776cb59da170a674b71ff086bd63f4c0426e9e..c23e3b7da545bb938499dd5e49fa1b371db65f31 100644
--- a/services/ui/ws/platform_display.h
+++ b/services/ui/ws/frame_generator.h
@@ -1,141 +1,51 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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_PLATFORM_DISPLAY_H_
-#define SERVICES_UI_WS_PLATFORM_DISPLAY_H_
+#ifndef SERVICES_UI_WS_FRAME_GENERATOR_H_
+#define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
-#include <stdint.h>
-
-#include <map>
 #include <memory>
 
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
 #include "base/timer/timer.h"
-#include "build/build_config.h"
-#include "cc/surfaces/surface.h"
-#include "services/ui/public/interfaces/window_manager.mojom.h"
-#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
-#include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/ui/ws/platform_display_delegate.h"
-#include "services/ui/ws/platform_display_init_params.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/platform_window/platform_window_delegate.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
-class SurfaceIdAllocator;
-class SurfaceManager;
-}  // namespace cc
-
-namespace gles2 {
-class GpuState;
-}  // namespace gles2
-
-namespace shell {
-class Connector;
-}  // namespace shell
-
-namespace ui {
-class CursorLoader;
-class PlatformWindow;
-struct TextInputState;
-}  // namespace ui
+class RenderPass;
+enum class SurfaceDrawStatus;
+}
 
 namespace ui {
 
+class DisplayCompositor;
 class GpuState;
 class SurfacesState;
-class DisplayCompositor;
 
 namespace ws {
 
-class EventDispatcher;
-class PlatformDisplayFactory;
+class FrameGeneratorDelegate;
 class ServerWindow;
 
-struct ViewportMetrics {
-  gfx::Size size_in_pixels;
-  float device_scale_factor = 0.f;
-};
-
-// PlatformDisplay is used to connect the root ServerWindow to a display.
-class PlatformDisplay {
- public:
-  virtual ~PlatformDisplay() {}
-
-  static PlatformDisplay* Create(const PlatformDisplayInitParams& init_params);
-
-  virtual void Init(PlatformDisplayDelegate* delegate) = 0;
-
-  // Schedules a paint for the specified region in the coordinates of |window|.
-  virtual void SchedulePaint(const ServerWindow* window,
-                             const gfx::Rect& bounds) = 0;
-
-  virtual void SetViewportSize(const gfx::Size& size) = 0;
-
-  virtual void SetTitle(const base::string16& title) = 0;
-
-  virtual void SetCapture() = 0;
-
-  virtual void ReleaseCapture() = 0;
-
-  virtual void SetCursorById(int32_t cursor) = 0;
-
-  virtual mojom::Rotation GetRotation() = 0;
-
-  virtual float GetDeviceScaleFactor() = 0;
-
-  virtual void UpdateTextInputState(const ui::TextInputState& state) = 0;
-  virtual void SetImeVisibility(bool visible) = 0;
-
-  // Returns true if a compositor frame has been submitted but not drawn yet.
-  virtual bool IsFramePending() const = 0;
-
-  virtual void RequestCopyOfOutput(
-      std::unique_ptr<cc::CopyOutputRequest> output_request) = 0;
-
-  virtual int64_t GetDisplayId() const = 0;
-
-  // Overrides factory for testing. Default (NULL) value indicates regular
-  // (non-test) environment.
-  static void set_factory_for_testing(PlatformDisplayFactory* factory) {
-    PlatformDisplay::factory_ = factory;
-  }
-
- private:
-  // Static factory instance (always NULL for non-test).
-  static PlatformDisplayFactory* factory_;
-};
-
-// PlatformDisplay implementation that connects to the services necessary to
-// actually display.
-class DefaultPlatformDisplay : public PlatformDisplay,
-                               public ui::PlatformWindowDelegate {
+// Responsible for redrawing the display in response to the redraw requests by
+// submitting CompositorFrames to the owned DisplayCompositor.
+class FrameGenerator {
  public:
-  explicit DefaultPlatformDisplay(const PlatformDisplayInitParams& init_params);
-  ~DefaultPlatformDisplay() override;
-
-  // PlatformDisplay:
-  void Init(PlatformDisplayDelegate* delegate) override;
-  void SchedulePaint(const ServerWindow* window,
-                     const gfx::Rect& bounds) override;
-  void SetViewportSize(const gfx::Size& size) override;
-  void SetTitle(const base::string16& title) override;
-  void SetCapture() override;
-  void ReleaseCapture() override;
-  void SetCursorById(int32_t cursor) override;
-  float GetDeviceScaleFactor() override;
-  mojom::Rotation GetRotation() override;
-  void UpdateTextInputState(const ui::TextInputState& state) override;
-  void SetImeVisibility(bool visible) override;
-  bool IsFramePending() const override;
+  FrameGenerator(FrameGeneratorDelegate* delegate,
+                 scoped_refptr<GpuState> gpu_state,
+                 scoped_refptr<SurfacesState> surfaces_state);
+  virtual ~FrameGenerator();
+
+  // 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) override;
-  int64_t GetDisplayId() const override;
+      std::unique_ptr<cc::CopyOutputRequest> output_request);
+
+  bool is_frame_pending() { return frame_pending_; }
 
  private:
   void WantToDraw();
@@ -145,51 +55,40 @@ class DefaultPlatformDisplay : public PlatformDisplay,
   // http://crbug.com/533042
   void Draw();
 
-  // This is called after cc::Display has completed generating a new frame
-  // for the display. TODO(fsamuel): Idle time processing should happen here
-  // if there is budget for it.
+  // This is called after the DisplayCompositor 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(cc::SurfaceDrawStatus status);
-  void UpdateMetrics(const gfx::Size& size, float device_scale_factor);
+
+  // Generates the CompositorFrame for the current |dirty_rect_|.
   cc::CompositorFrame GenerateCompositorFrame();
 
-  // ui::PlatformWindowDelegate:
-  void OnBoundsChanged(const gfx::Rect& new_bounds) override;
-  void OnDamageRect(const gfx::Rect& damaged_region) override;
-  void DispatchEvent(ui::Event* event) override;
-  void OnCloseRequest() override;
-  void OnClosed() override;
-  void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
-  void OnLostCapture() override;
-  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
-                                    float device_scale_factor) override;
-  void OnAcceleratedWidgetDestroyed() override;
-  void OnActivationChanged(bool active) override;
-
-  int64_t display_id_;
+  // 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);
 
+  FrameGeneratorDelegate* delegate_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
-  PlatformDisplayDelegate* delegate_;
-
-  ViewportMetrics metrics_;
-  gfx::Rect dirty_rect_;
-  base::Timer draw_timer_;
-  bool frame_pending_;
 
   std::unique_ptr<DisplayCompositor> display_compositor_;
-  std::unique_ptr<ui::PlatformWindow> platform_window_;
 
-#if !defined(OS_ANDROID)
-  std::unique_ptr<ui::CursorLoader> cursor_loader_;
-#endif
+  // 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;
 
-  base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
+  base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
+  DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
-#endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_
+#endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_