Convert additional ozone/drm callbacks to OnceCallback

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 <memory>
 #include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
+#include "ui/ozone/public/swap_completion_callback.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
 
 class CrtcController;
 class ScanoutBuffer;
 class DrmDevice;
@@ skipping 46 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 HardwareDisplayController {
-  typedef base::Callback<void(gfx::SwapResult)> PageFlipCallback;
+  //  typedef base::Callback<void(gfx::SwapResult)> SwapCompletionOnceCallback;

[dnicoara, 2017/05/15 20:22:14]

nit: Delete line

 
  public:
   HardwareDisplayController(std::unique_ptr<CrtcController> controller,
                             const gfx::Point& origin);
   ~HardwareDisplayController();
 
   // Performs the initial CRTC configuration. If successful, it will display the
   // framebuffer for |primary| with |mode|.
   bool Modeset(const OverlayPlane& primary, drmModeModeInfo mode);
 
@@ skipping 11 matching lines @@
   // object the event belongs to.
   //
   // Between this call and the callback, the framebuffers used in this call
   // should not be modified in any way as it would cause screen tearing if the
   // hardware performed the flip. Note that the frontbuffer should also not
   // be modified as it could still be displayed.
   //
   // Note that this function does not block. Also, this function should not be
   // called again before the page flip occurrs.
   void SchedulePageFlip(const OverlayPlaneList& plane_list,
-                        const PageFlipCallback& callback);
+                        SwapCompletionOnceCallback callback);
 
   // Returns true if the page flip with the |plane_list| would succeed. This
   // doesn't change any state.
   bool TestPageFlip(const OverlayPlaneList& plane_list);
 
   bool IsFormatSupported(uint32_t fourcc_format, uint32_t z_order) const;
 
   // Return the supported modifiers for |fourcc_format| for this
   // controller.
   std::vector<uint64_t> GetFormatModifiers(uint32_t fourcc_format);
@@ skipping 22 matching lines @@
 
   const std::vector<std::unique_ptr<CrtcController>>& crtc_controllers() const {
     return crtc_controllers_;
   }
 
   scoped_refptr<DrmDevice> GetAllocationDrmDevice() const;
 
  private:
   bool ActualSchedulePageFlip(const OverlayPlaneList& plane_list,
                               bool test_only,
-                              const PageFlipCallback& callback);
+                              SwapCompletionOnceCallback callback);
 
   std::unordered_map<DrmDevice*, std::unique_ptr<HardwareDisplayPlaneList>>
       owned_hardware_planes_;
 
   // Stores the CRTC configuration. This is used to identify monitors and
   // configure them.
   std::vector<std::unique_ptr<CrtcController>> crtc_controllers_;
 
   // Location of the controller on the screen.
   gfx::Point origin_;
 
   bool is_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_