Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: ui/ozone/platform/dri/screen_manager.cc

Issue 556263005: [Ozone-DRI] Fix blank screen on init (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/dri/screen_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/screen_manager.cc
diff --git a/ui/ozone/platform/dri/screen_manager.cc b/ui/ozone/platform/dri/screen_manager.cc
index 081de693ee7cc3a893d4fad1bcc78162fd205fde..6330387168ec28ab01f649b5d077495e7093f296 100644
--- a/ui/ozone/platform/dri/screen_manager.cc
+++ b/ui/ozone/platform/dri/screen_manager.cc
@@ -117,12 +117,6 @@ base::WeakPtr<HardwareDisplayController> ScreenManager::GetDisplayController(
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>();
}
@@ -153,21 +147,6 @@ ScreenManager::FindActiveDisplayControllerByLocation(const gfx::Rect& bounds) {
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 =
« no previous file with comments | « ui/ozone/platform/dri/screen_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698