Preliminary atomic patch

ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc

 // 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.
 
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 
 #include <drm.h>
 #include <xf86drm.h>
 
 #include <set>
@@ skipping 77 matching lines @@
   std::set<uint32_t> plane_ids;
   for (uint32_t i = 0; i < num_planes; ++i) {
     ScopedDrmPlanePtr drm_plane(
         drmModeGetPlane(drm->get_fd(), plane_resources->planes[i]));
     if (!drm_plane) {
       LOG(ERROR) << "Failed to get plane " << i << ".";
       return false;
     }
     plane_ids.insert(drm_plane->plane_id);
     scoped_ptr<HardwareDisplayPlane> plane(
-        new HardwareDisplayPlane(drm_plane.Pass()));
+        CreatePlane(drm_plane->plane_id, drm_plane->possible_crtcs));
     if (plane->Initialize(drm))
       planes_.push_back(plane.release());
   }
 
   // crbug.com/464085: if driver reports no primary planes for a crtc, create a
   // dummy plane for which we can assign exactly one overlay.
   // TODO(dnicoara): refactor this to simplify AssignOverlayPlanes and move
   // this workaround into HardwareDisplayPlaneLegacy.
   for (int i = 0; i < resources->count_crtcs; ++i) {
     if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
       scoped_ptr<HardwareDisplayPlane> dummy_plane(
-          new HardwareDisplayPlane(0, (1 << i)));
+          CreatePlane(resources->crtcs[i] - 1, (1 << i)));
       dummy_plane->set_is_dummy(true);
       if (dummy_plane->Initialize(drm))
         planes_.push_back(dummy_plane.release());
     }
   }
 
   std::sort(planes_.begin(), planes_.end(),
             [](HardwareDisplayPlane* l, HardwareDisplayPlane* r) {
               return l->plane_id() < r->plane_id();
             });
   return true;
 }
 
+scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManager::CreatePlane(
+    uint32_t plane_id,
+    uint32_t possible_crtcs) {
+  return scoped_ptr<HardwareDisplayPlane>(
+      new HardwareDisplayPlane(plane_id, possible_crtcs));
+}
+
 HardwareDisplayPlane* HardwareDisplayPlaneManager::FindNextUnusedPlane(
     size_t* index,
     uint32_t crtc_index) {
   for (size_t i = *index; i < planes_.size(); ++i) {
     auto plane = planes_[i];
     if (!plane->in_use() && plane->CanUseForCrtc(crtc_index)) {
       *index = i + 1;
       return plane;
     }
   }
@@ skipping 72 matching lines @@
     if (plane->owning_crtc() == crtc_id) {
       plane->set_owning_crtc(0);
       plane->set_in_use(false);
     } else {
       plane_list->old_plane_list.push_back(plane);
     }
   }
 }
 
 }  // namespace ui