Return primary display if out of bounds point or NULL ponter is passed to gfx::Screen::GeDisplayNea

ash/display/multi_display_manager.cc

 // Copyright (c) 2012 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 "ash/display/multi_display_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
@@ skipping 101 matching lines @@
 bool MultiDisplayManager::UpdateWorkAreaOfDisplayNearestWindow(
     const aura::Window* window,
     const gfx::Insets& insets) {
   const RootWindow* root = window->GetRootWindow();
   gfx::Display& display = FindDisplayForRootWindow(root);
   gfx::Rect old_work_area = display.work_area();
   display.UpdateWorkAreaFromInsets(insets);
   return old_work_area != display.work_area();
 }
 
+const gfx::Display& MultiDisplayManager::GetDisplayForId(int64 id) const {
+  for (DisplayList::const_iterator iter = displays_.begin();
+       iter != displays_.end(); ++iter) {
+    if ((*iter).id() == id)
+      return *iter;
+  }
+  VLOG(1) << "display not found for id:" << id;
+  return GetInvalidDisplay();
+}
+
 const gfx::Display& MultiDisplayManager::FindDisplayContainingPoint(
     const gfx::Point& point_in_screen) const {
   for (DisplayList::const_iterator iter = displays_.begin();
        iter != displays_.end(); ++iter) {
     const gfx::Display& display = *iter;
     if (display.bounds().Contains(point_in_screen))
       return display;
   }
   return GetInvalidDisplay();
 }
@@ skipping 125 matching lines @@
   return index < displays_.size() ? &displays_[index] : NULL;
 }
 
 size_t MultiDisplayManager::GetNumDisplays() const {
   return displays_.size();
 }
 
 const gfx::Display& MultiDisplayManager::GetDisplayNearestWindow(
     const Window* window) const {
   if (!window)
-    return displays_[0];
+    return DisplayController::GetPrimaryDisplay();
   const RootWindow* root = window->GetRootWindow();
   MultiDisplayManager* manager = const_cast<MultiDisplayManager*>(this);
   return root ? manager->FindDisplayForRootWindow(root) : GetInvalidDisplay();
 }
 
 const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   // Fallback to the primary display if there is no root display containing
   // the |point|.
   const gfx::Display& display = FindDisplayContainingPoint(point);
-  return display.is_valid() ? display : displays_[0];
+  return display.is_valid() ? display : DisplayController::GetPrimaryDisplay();
 }
 
 const gfx::Display& MultiDisplayManager::GetDisplayMatching(
     const gfx::Rect& rect) const {
   if (rect.IsEmpty())
     return GetDisplayNearestPoint(rect.origin());
 
   int max = 0;
   const gfx::Display* matching = 0;
   for (std::vector<gfx::Display>::const_iterator iter = displays_.begin();
        iter != displays_.end(); ++iter) {
     const gfx::Display& display = *iter;
     gfx::Rect intersect = display.bounds().Intersect(rect);
     int area = intersect.width() * intersect.height();
     if (area > max) {
       max = area;
       matching = &(*iter);
     }
   }
   // Fallback to the primary display if there is no matching display.
-  return matching ? *matching : displays_[0];
+  return matching ? *matching : DisplayController::GetPrimaryDisplay();
 }
 
 std::string MultiDisplayManager::GetDisplayNameFor(
     const gfx::Display& display) {
 #if defined(USE_X11)
   std::vector<XID> outputs;
   if (display.id() != gfx::Display::kInvalidDisplayID &&
       ui::GetOutputDeviceHandles(&outputs)) {
     for (size_t i = 0; i < outputs.size(); ++i) {
       uint16 manufacturer_id = 0;
@@ skipping 45 matching lines @@
   base::SplitString(size_str, ',', &parts);
   for (vector<string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter) {
     AddDisplayFromSpec(*iter);
   }
   if (displays_.empty())
     AddDisplayFromSpec(std::string() /* default */);
 }
 
 void MultiDisplayManager::CycleDisplayImpl() {
+  DCHECK(!displays_.empty());
   std::vector<gfx::Display> new_displays;
-  if (displays_.size() > 1) {
-    // Remove if there is more than one display.
-    int count = displays_.size() - 1;
-    for (DisplayList::const_iterator iter = displays_.begin();
-         count-- > 0; ++iter) {
-      new_displays.push_back(*iter);
-    }
-  } else {
-    // Add if there is only one display.
-    new_displays.push_back(displays_[0]);
+  new_displays.push_back(DisplayController::GetPrimaryDisplay());
+  // Add if there is only one display.
+  if (displays_.size() == 1)
     new_displays.push_back(CreateDisplayFromSpec("100+200-500x400"));
-  }
-  if (new_displays.size())
-    OnNativeDisplaysChanged(new_displays);
+  OnNativeDisplaysChanged(new_displays);
 }
 
 void MultiDisplayManager::ScaleDisplayImpl() {
-  if (displays_.size() > 0) {
-    std::vector<gfx::Display> new_displays;
-    for (DisplayList::const_iterator iter = displays_.begin();
-         iter != displays_.end(); ++iter) {
-      gfx::Display display = *iter;
-      float factor = display.device_scale_factor() == 1.0f ? 2.0f : 1.0f;
-      display.SetScaleAndBounds(
-          factor, gfx::Rect(display.bounds_in_pixel().origin(),
-                            display.size().Scale(factor)));
-      new_displays.push_back(display);
-    }
-    OnNativeDisplaysChanged(new_displays);
+  DCHECK(!displays_.empty());
+  std::vector<gfx::Display> new_displays;
+  for (DisplayList::const_iterator iter = displays_.begin();
+       iter != displays_.end(); ++iter) {
+    gfx::Display display = *iter;
+    float factor = display.device_scale_factor() == 1.0f ? 2.0f : 1.0f;
+    display.SetScaleAndBounds(
+        factor, gfx::Rect(display.bounds_in_pixel().origin(),
+                          display.size().Scale(factor)));
+    new_displays.push_back(display);
   }
+  OnNativeDisplaysChanged(new_displays);
 }
 
 gfx::Display& MultiDisplayManager::FindDisplayForRootWindow(
     const aura::RootWindow* root_window) {
   int64 id = root_window->GetProperty(kDisplayIdKey);
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != gfx::Display::kInvalidDisplayID);
   return FindDisplayForId(id);
 }
 
@@ skipping 28 matching lines @@
   DisplayList::iterator iter_to_update = to_update->begin();
   DisplayList::const_iterator iter = displays_.begin();
   for (; iter != displays_.end() && iter_to_update != to_update->end();
        ++iter, ++iter_to_update) {
     (*iter_to_update).set_id((*iter).id());
   }
 }
 
 }  // namespace internal
 }  // namespace ash