Preliminary atomic patch

ui/ozone/platform/drm/gpu/hardware_display_plane_manager.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_PLANE_MANAGER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <xf86drmMode.h>
@@ skipping 46 matching lines @@
       int framebuffer;
       gfx::Rect bounds;
       gfx::Rect src_rect;
     };
     std::vector<Plane> planes;
   };
   // In the case of non-atomic operation, this info will be used for
   // pageflipping.
   std::vector<PageFlipInfo> legacy_page_flips;
 
+#if defined(USE_DRM_ATOMIC)
+  ScopedDrmPropertySetPtr atomic_property_set;
+#endif  // defined(USE_DRM_ATOMIC)
+
   // Set if the last operation on this list was a Commit().
   bool committed;
 };
 
 class OZONE_EXPORT HardwareDisplayPlaneManager {
  public:
   HardwareDisplayPlaneManager();
   virtual ~HardwareDisplayPlaneManager();
 
   // This parses information from the drm driver, adding any new planes
@@ skipping 17 matching lines @@
 
   const ScopedVector<HardwareDisplayPlane>& planes() { return planes_; }
 
  protected:
   virtual bool SetPlaneData(HardwareDisplayPlaneList* plane_list,
                             HardwareDisplayPlane* hw_plane,
                             const OverlayPlane& overlay,
                             uint32_t crtc_id,
                             const gfx::Rect& src_rect,
                             CrtcController* crtc) = 0;
+
+  virtual scoped_ptr<HardwareDisplayPlane> CreatePlane(uint32_t plane_id,
+                                                       uint32_t possible_crtcs);
+
   // Finds the plane located at or after |*index| that is not in use and can
   // be used with |crtc_index|.
   HardwareDisplayPlane* FindNextUnusedPlane(size_t* index, uint32_t crtc_index);
 
   // Convert |crtc_id| into an index, returning -1 if the ID couldn't be found.
   int LookupCrtcIndex(uint32_t crtc_id);
 
   // Object containing the connection to the graphics device and wraps the API
   // calls to control it. Not owned.
   DrmDevice* drm_;
 
   ScopedVector<HardwareDisplayPlane> planes_;
   std::vector<uint32_t> crtcs_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareDisplayPlaneManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_H_