[Ozone-DRI] Fix blank screen on init

ui/ozone/platform/dri/screen_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/dri/screen_manager.h"
 
 #include <xf86drmMode.h>
 
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 99 matching lines @@
   // configuration reader and ScreenManager is called from there to create the
   // one display needed by the content_shell target.
   if (controllers_.empty())
     ForceInitializationOfPrimaryDisplay();
 
   HardwareDisplayControllers::iterator it =
       FindActiveDisplayControllerByLocation(bounds);
   if (it != controllers_.end())
     return (*it)->AsWeakPtr();
 
-  // If no active controllers then pick the first controller at the location.
-  // TODO(dnicoara): Remove once async display configuration is fully supported.
-  it = FindDisplayControllerByLocation(bounds);
-  if (it != controllers_.end())
-    return (*it)->AsWeakPtr();
-
   return base::WeakPtr<HardwareDisplayController>();
 }
 
 ScreenManager::HardwareDisplayControllers::iterator
 ScreenManager::FindDisplayController(uint32_t crtc) {
   for (HardwareDisplayControllers::iterator it = controllers_.begin();
        it != controllers_.end();
        ++it) {
     if ((*it)->HasCrtc(crtc))
       return it;
@@ skipping 10 matching lines @@
     gfx::Rect controller_bounds((*it)->origin(), (*it)->GetModeSize());
     // We don't perform a strict check since content_shell will have windows
     // smaller than the display size.
     if (controller_bounds.Contains(bounds) && !(*it)->IsDisabled())
       return it;
   }
 
   return controllers_.end();
 }
 
-ScreenManager::HardwareDisplayControllers::iterator
-ScreenManager::FindDisplayControllerByLocation(const gfx::Rect& bounds) {
-  for (HardwareDisplayControllers::iterator it = controllers_.begin();
-       it != controllers_.end();
-       ++it) {
-    gfx::Rect controller_bounds((*it)->origin(), (*it)->GetModeSize());
-    // We don't perform a strict check since content_shell will have windows
-    // smaller than the display size.
-    if (controller_bounds.Contains(bounds))
-      return it;
-  }
-
-  return controllers_.end();
-}
-
 void ScreenManager::ForceInitializationOfPrimaryDisplay() {
   LOG(WARNING) << "Forcing initialization of primary display.";
   ScopedVector<HardwareDisplayControllerInfo> displays =
       GetAvailableDisplayControllerInfos(dri_->get_fd());
 
   DCHECK_NE(0u, displays.size());
 
   ScopedDrmPropertyPtr dpms(
       dri_->GetProperty(displays[0]->connector(), "DPMS"));
   if (dpms)
@@ skipping 46 matching lines @@
 
   // When things go wrong revert back to the previous configuration since
   // it is expected that the configuration would not have changed if
   // things fail.
   (*original)->AddCrtc((*mirror)->RemoveCrtc(crtc));
   (*original)->Enable();
   return false;
 }
 
 }  // namespace ui