[ozone] Keep the queue of surfaceless buffers inside gl_surface_ozone

ui/ozone/platform/drm/gpu/hardware_display_controller.h

 // Copyright 2014 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 UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <xf86drmMode.h>
 #include <deque>
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/memory/weak_ptr.h"
 #include "ui/ozone/ozone_export.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
-#include "ui/ozone/platform/drm/gpu/page_flip_observer.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
 
 class CrtcController;
 class ScanoutBuffer;
 class DrmDevice;
@@ skipping 45 matching lines @@
 //       ^                  ^
 //       |                  |
 //      ----------------------
 //      |        CRTC1       |
 //      ----------------------
 //
 // Note that it is possible to have more connectors than CRTCs which means that
 // only a subset of connectors can be active independently, showing different
 // framebuffers. Though, in this case, it would be possible to have all
 // connectors active if some use the same CRTC to mirror the display.
-class OZONE_EXPORT HardwareDisplayController
-    : public base::SupportsWeakPtr<HardwareDisplayController>,
-      public PageFlipObserver {
+class OZONE_EXPORT HardwareDisplayController {
  public:
   explicit HardwareDisplayController(scoped_ptr<CrtcController> controller);
-  ~HardwareDisplayController() override;
+  ~HardwareDisplayController();
 
   // Performs the initial CRTC configuration. If successful, it will display the
   // framebuffer for |primary| with |mode|.
   bool Modeset(const OverlayPlane& primary, drmModeModeInfo mode);
 
   // Disables the CRTC.
   void Disable();
 
   // Schedules the |overlays|' framebuffers to be displayed on the next vsync
   // event. The event will be posted on the graphics card file descriptor |fd_|
@@ skipping 41 matching lines @@
   const std::vector<CrtcController*>& crtc_controllers() const {
     return crtc_controllers_.get();
   }
 
   scoped_refptr<DrmDevice> GetAllocationDrmDevice() const;
 
  private:
   // Returns true if any of the CRTCs is waiting for a page flip.
   bool HasPendingPageFlips() const;
 
-  bool ActualSchedulePageFlip();
-
-  void ProcessPageFlipRequest();
-
-  void ClearPendingRequests();
-
-  // PageFlipObserver:
-  void OnPageFlipEvent() override;
-
-  struct PageFlipRequest {
-    PageFlipRequest(const OverlayPlaneList& planes,
-                    bool is_sync,
-                    const base::Closure& callback);
-    ~PageFlipRequest();
-
-    OverlayPlaneList planes;
-    bool is_sync;
-    base::Closure callback;
-  };
-
-  // Buffers need to be declared first so that they are destroyed last. Needed
-  // since the controllers may reference the buffers.
-  OverlayPlaneList current_planes_;
-  // Planes currently being queued without having SchedulePageFlip() called.
-  OverlayPlaneList pending_planes_;
-  // Plane lists for which SchedulePageFlip() was called. They are waiting for
-  // previous page flip events to be completed before they can be serviced.
-  std::deque<PageFlipRequest> requests_;
   scoped_refptr<ScanoutBuffer> cursor_buffer_;

[dnicoara, 2015/04/23 15:34:56]

nit: Unrelated, but could you just remove this as well. It isn't being used in
HDC anymore.

 
   base::ScopedPtrHashMap<DrmDevice*, HardwareDisplayPlaneList>
       owned_hardware_planes_;
 
   // Stores the CRTC configuration. This is used to identify monitors and
   // configure them.
   ScopedVector<CrtcController> crtc_controllers_;
 
   // Location of the controller on the screen.
   gfx::Point origin_;
 
   // The mode used by the last modesetting operation.
   drmModeModeInfo mode_;
 
   bool is_disabled_;
+  bool ignore_page_flip_event_;

[dnicoara, 2015/04/23 15:34:56]

remove

 
   DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_