Optimize plane usage when primary is obscured by Overlay

ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.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_atomic.h"
 
 #include "base/bind.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h"
@@ skipping 47 matching lines @@
       crtcs.push_back(atomic_plane->crtc()->AsWeakPtr());
   }
 
   if (test_only) {
     for (HardwareDisplayPlane* plane : plane_list->plane_list) {
       plane->set_in_use(false);
     }
   } else {
     plane_list->plane_list.swap(plane_list->old_plane_list);
   }
-  plane_list->plane_list.clear();
 
   uint32_t flags = 0;
   if (test_only) {
     flags = DRM_MODE_ATOMIC_TEST_ONLY;
   } else {
     flags = DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK;
   }
 
   if (!drm_->CommitProperties(plane_list->atomic_property_set.get(), flags,
                               crtcs.size(),
                               base::Bind(&AtomicPageFlipCallback, crtcs))) {
     PLOG(ERROR) << "Failed to commit properties";
+    ResetCurrentPlaneList(plane_list);
     return false;
   }
+
+  plane_list->plane_list.clear();
   plane_list->atomic_property_set.reset(drmModeAtomicAlloc());
   return true;
 }
 
 bool HardwareDisplayPlaneManagerAtomic::SetPlaneData(
     HardwareDisplayPlaneList* plane_list,
     HardwareDisplayPlane* hw_plane,
     const OverlayPlane& overlay,
     uint32_t crtc_id,
     const gfx::Rect& src_rect,
@@ skipping 11 matching lines @@
 }
 
 scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManagerAtomic::CreatePlane(
     uint32_t plane_id,
     uint32_t possible_crtcs) {
   return scoped_ptr<HardwareDisplayPlane>(
       new HardwareDisplayPlaneAtomic(plane_id, possible_crtcs));
 }
 
 }  // namespace ui