ozone: Directly provide size of active mode from HardwareDisplayController

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"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/crtc_state.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 
 namespace ui {
 
-namespace {
-
-gfx::Size GetModeSize(const drmModeModeInfo& mode) {
-  return gfx::Size(mode.hdisplay, mode.vdisplay);
-}
-
-}  // namespace
-
 ScreenManager::ScreenManager(DriWrapper* dri,
                              ScanoutBufferGenerator* buffer_generator)
     : dri_(dri), buffer_generator_(buffer_generator) {
 }
 
 ScreenManager::~ScreenManager() {
 }
 
 void ScreenManager::RemoveDisplayController(uint32_t crtc) {
   HardwareDisplayControllers::iterator it = FindDisplayController(crtc);
   if (it != controllers_.end()) {
     bool is_mirrored = (*it)->IsMirrored();
     (*it)->RemoveCrtc(crtc);
     if (!is_mirrored)
       controllers_.erase(it);
   }
 }
 
 bool ScreenManager::ConfigureDisplayController(uint32_t crtc,
                                                uint32_t connector,
                                                const gfx::Point& origin,
                                                const drmModeModeInfo& mode) {
-  gfx::Rect modeset_bounds(origin, GetModeSize(mode));
+  gfx::Rect modeset_bounds(
+      origin.x(), origin.y(), mode.hdisplay, mode.vdisplay);
   HardwareDisplayControllers::iterator it = FindDisplayController(crtc);
   HardwareDisplayController* controller = NULL;
   if (it != controllers_.end()) {
     controller = *it;
     // If nothing changed just enable the controller. Note, we perform an exact
     // comparison on the mode since the refresh rate may have changed.
     if (SameMode(mode, controller->get_mode()) &&
         origin == controller->origin() && !controller->IsDisabled())
       return controller->Enable();
 
@@ skipping 76 matching lines @@
   }
 
   return controllers_.end();
 }
 
 ScreenManager::HardwareDisplayControllers::iterator
 ScreenManager::FindActiveDisplayControllerByLocation(const gfx::Rect& bounds) {
   for (HardwareDisplayControllers::iterator it = controllers_.begin();
        it != controllers_.end();
        ++it) {
-    gfx::Rect controller_bounds((*it)->origin(),
-                                GetModeSize((*it)->get_mode()));
+    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();
 }
 
 void ScreenManager::ForceInitializationOfPrimaryDisplay() {
@@ skipping 53 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