Update DisplayConfigurator to use c++11 style for-loops

ui/display/chromeos/display_configurator.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/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
@@ skipping 72 matching lines @@
                         gfx::Size* framebuffer_size) const override;
 
  private:
   // Parses the |displays| into a list of DisplayStates. This effectively adds
   // |mirror_mode| and |selected_mode| to the returned results.
   // TODO(dnicoara): Break this into GetSelectedMode() and GetMirrorMode() and
   // remove DisplayState.
   std::vector<DisplayState> ParseDisplays(
       const std::vector<DisplaySnapshot*>& displays) const;
 
+  const DisplayMode* GetUserSelectedMode(const DisplaySnapshot& display) const;
+
   // Helper method for ParseDisplays() that initializes the passed-in
   // displays' |mirror_mode| fields by looking for a mode in |internal_display|
   // and |external_display| having the same resolution. Returns false if a
   // shared mode wasn't found or created.
   //
   // |try_panel_fitting| allows creating a panel-fitting mode for
   // |internal_display| instead of only searching for a matching mode (note that
   // it may lead to a crash if |internal_display| is not capable of panel
   // fitting).
   //
@@ skipping 38 matching lines @@
   return configurator_->current_power_state_;
 }
 
 std::vector<DisplayState>
 DisplayConfigurator::DisplayLayoutManagerImpl::ParseDisplays(
     const std::vector<DisplaySnapshot*>& snapshots) const {
   std::vector<DisplayState> cached_displays;
   for (auto snapshot : snapshots) {
     DisplayState display_state;
     display_state.display = snapshot;
+    display_state.selected_mode = GetUserSelectedMode(*snapshot);
     cached_displays.push_back(display_state);
   }
 
-  // Set |selected_mode| fields.
-  for (size_t i = 0; i < cached_displays.size(); ++i) {
-    DisplayState* display_state = &cached_displays[i];
-    gfx::Size size;
-    if (GetStateController() &&
-        GetStateController()->GetResolutionForDisplayId(
-            display_state->display->display_id(), &size)) {
-      display_state->selected_mode =
-          FindDisplayModeMatchingSize(*display_state->display, size);
-    }
-
-    // Fall back to native mode.
-    if (!display_state->selected_mode)
-      display_state->selected_mode = display_state->display->native_mode();
-  }
-
   // Set |mirror_mode| fields.
   if (cached_displays.size() == 2) {
     bool one_is_internal =
         cached_displays[0].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
     bool two_is_internal =
         cached_displays[1].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
     int internal_displays =
         (one_is_internal ? 1 : 0) + (two_is_internal ? 1 : 0);
     DCHECK_LT(internal_displays, 2);
     LOG_IF(WARNING, internal_displays >= 2)
@@ skipping 154 matching lines @@
                         mode_info->size().height());
       }
       break;
     }
   }
 
   *framebuffer_size = size;
   return true;
 }
 
+const DisplayMode*
+DisplayConfigurator::DisplayLayoutManagerImpl::GetUserSelectedMode(
+    const DisplaySnapshot& display) const {
+  gfx::Size size;
+  const DisplayMode* selected_mode = nullptr;
+  if (GetStateController() &&
+      GetStateController()->GetResolutionForDisplayId(display.display_id(),
+                                                      &size)) {
+    selected_mode = FindDisplayModeMatchingSize(display, size);
+  }
+
+  // Fall back to native mode.
+  if (!selected_mode)
+    selected_mode = display.native_mode();

[oshima, 2015/03/19 19:11:01]

nit: return selected_mode ? selected_mode : display.native_mode();

[dnicoara, 2015/03/19 19:27:01]

Done.

+
+  return selected_mode;
+}
+
 bool DisplayConfigurator::DisplayLayoutManagerImpl::FindMirrorMode(
     DisplayState* internal_display,
     DisplayState* external_display,
     bool try_panel_fitting,
     bool preserve_aspect) const {
   const DisplayMode* internal_native_info =
       internal_display->display->native_mode();
   const DisplayMode* external_native_info =
       external_display->display->native_mode();
   if (!internal_native_info || !external_native_info)
     return false;
 
   // Check if some external display resolution can be mirrored on internal.
   // Prefer the modes in the order they're present in DisplaySnapshot, assuming
   // this is the order in which they look better on the monitor.
-  for (DisplayModeList::const_iterator external_it =
-           external_display->display->modes().begin();
-       external_it != external_display->display->modes().end(); ++external_it) {
-    const DisplayMode& external_info = **external_it;
+  for (auto external_mode : external_display->display->modes()) {

[oshima, 2015/03/19 19:11:01]

const auto* (I'd prefer to have type here, if it fits in single one. If not,
please disregard)

[dnicoara, 2015/03/19 19:27:01]

Replaced with const auto*

I would have liked the type as well, except it is just shy of fitting on the
line.

     bool is_native_aspect_ratio =
-        external_native_info->size().width() * external_info.size().height() ==
-        external_native_info->size().height() * external_info.size().width();
+        external_native_info->size().width() * external_mode->size().height() ==
+        external_native_info->size().height() * external_mode->size().width();
     if (preserve_aspect && !is_native_aspect_ratio)
       continue;  // Allow only aspect ratio preserving modes for mirroring.
 
     // Try finding an exact match.
-    for (DisplayModeList::const_iterator internal_it =
-             internal_display->display->modes().begin();
-         internal_it != internal_display->display->modes().end();
-         ++internal_it) {
-      const DisplayMode& internal_info = **internal_it;
-      if (internal_info.size().width() == external_info.size().width() &&
-          internal_info.size().height() == external_info.size().height() &&
-          internal_info.is_interlaced() == external_info.is_interlaced()) {
-        internal_display->mirror_mode = *internal_it;
-        external_display->mirror_mode = *external_it;
+    for (auto internal_mode : internal_display->display->modes()) {
+      if (internal_mode->size() == external_mode->size() &&
+          internal_mode->is_interlaced() == external_mode->is_interlaced()) {
+        internal_display->mirror_mode = internal_mode;
+        external_display->mirror_mode = external_mode;
         return true;  // Mirror mode found.
       }
     }
 
     // Try to create a matching internal display mode by panel fitting.
     if (try_panel_fitting) {
       // We can downscale by 1.125, and upscale indefinitely. Downscaling looks
       // ugly, so, can fit == can upscale. Also, internal panels don't support
       // fitting interlaced modes.
       bool can_fit = internal_native_info->size().width() >=
-                         external_info.size().width() &&
+                         external_mode->size().width() &&
                      internal_native_info->size().height() >=
-                         external_info.size().height() &&
-                     !external_info.is_interlaced();
+                         external_mode->size().height() &&
+                     !external_mode->is_interlaced();
       if (can_fit) {
         configurator_->native_display_delegate_->AddMode(
-            *internal_display->display, *external_it);
-        internal_display->display->add_mode(*external_it);
-        internal_display->mirror_mode = *external_it;
-        external_display->mirror_mode = *external_it;
+            *internal_display->display, external_mode);
+        internal_display->display->add_mode(external_mode);
+        internal_display->mirror_mode = external_mode;
+        external_display->mirror_mode = external_mode;
         return true;  // Mirror mode created.
       }
     }
   }
 
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayConfigurator implementation
 
 // static
 const DisplayMode* DisplayConfigurator::FindDisplayModeMatchingSize(
     const DisplaySnapshot& display,
     const gfx::Size& size) {
   const DisplayMode* best_mode = NULL;
-  for (DisplayModeList::const_iterator it = display.modes().begin();
-       it != display.modes().end();
-       ++it) {
-    const DisplayMode* mode = *it;
-
+  for (const DisplayMode* mode : display.modes()) {
     if (mode->size() != size)
       continue;
 
     if (mode == display.native_mode()) {
       best_mode = mode;
       break;
     }
 
     if (!best_mode) {
       best_mode = mode;
@@ skipping 117 matching lines @@
   configuration_task_->Run();
 }
 
 bool DisplayConfigurator::IsMirroring() const {
   return current_display_state_ == MULTIPLE_DISPLAY_STATE_DUAL_MIRROR ||
          (mirroring_controller_ &&
           mirroring_controller_->SoftwareMirroringEnabled());
 }
 
 bool DisplayConfigurator::ApplyProtections(const ContentProtections& requests) {
-  for (DisplayStateList::const_iterator it = cached_displays_.begin();
-       it != cached_displays_.end();
-       ++it) {
+  for (const DisplaySnapshot* display : cached_displays_) {
     uint32_t all_desired = 0;
 
     // In mirror mode, protection request of all displays need to be fulfilled.
     // In non-mirror mode, only request of client's display needs to be
     // fulfilled.
-    ContentProtections::const_iterator request_it;
     if (IsMirroring()) {
-      for (request_it = requests.begin();
-           request_it != requests.end();
-           ++request_it)
-        all_desired |= request_it->second;
+      for (const auto& protections_pair : requests)
+        all_desired |= protections_pair.second;
     } else {
-      request_it = requests.find((*it)->display_id());
+      ContentProtections::const_iterator request_it =
+          requests.find(display->display_id());
       if (request_it != requests.end())
         all_desired = request_it->second;
     }
 
-    switch ((*it)->type()) {
+    switch (display->type()) {
       case DISPLAY_CONNECTION_TYPE_UNKNOWN:
         return false;
       // DisplayPort, DVI, and HDMI all support HDCP.
       case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
       case DISPLAY_CONNECTION_TYPE_DVI:
       case DISPLAY_CONNECTION_TYPE_HDMI: {
         HDCPState current_state;
         // Need to poll the driver for updates since other applications may
         // have updated the state.
-        if (!native_display_delegate_->GetHDCPState(**it, &current_state))
+        if (!native_display_delegate_->GetHDCPState(*display, &current_state))
           return false;
         bool current_desired = (current_state != HDCP_STATE_UNDESIRED);
         bool new_desired = (all_desired & CONTENT_PROTECTION_METHOD_HDCP);
         // Don't enable again if HDCP is already active. Some buggy drivers
         // may disable and enable if setting "desired" in active state.
         if (current_desired != new_desired) {
           HDCPState new_state =
               new_desired ? HDCP_STATE_DESIRED : HDCP_STATE_UNDESIRED;
-          if (!native_display_delegate_->SetHDCPState(**it, new_state))
+          if (!native_display_delegate_->SetHDCPState(*display, new_state))
             return false;
         }
         break;
       }
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
         // No protections for these types. Do nothing.
         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
@@ skipping 11 matching lines @@
     return kInvalidClientId;
 
   return next_display_protection_client_id_++;
 }
 
 void DisplayConfigurator::UnregisterContentProtectionClient(
     ContentProtectionClientId client_id) {
   client_protection_requests_.erase(client_id);
 
   ContentProtections protections;
-  for (ProtectionRequests::const_iterator it =
-           client_protection_requests_.begin();
-       it != client_protection_requests_.end();
-       ++it) {
-    for (ContentProtections::const_iterator it2 = it->second.begin();
-         it2 != it->second.end();
-         ++it2) {
-      protections[it2->first] |= it2->second;
+  for (const auto& requests_pair : client_protection_requests_) {
+    for (const auto& protections_pair : requests_pair.second) {
+      protections[protections_pair.first] |= protections_pair.second;
     }
   }
 
   ApplyProtections(protections);
 }
 
 bool DisplayConfigurator::QueryContentProtectionStatus(
     ContentProtectionClientId client_id,
     int64_t display_id,
     uint32_t* link_mask,
     uint32_t* protection_mask) {
   if (!configure_display_ || display_externally_controlled_)
     return false;
 
   uint32_t enabled = 0;
   uint32_t unfulfilled = 0;
   *link_mask = 0;
-  for (DisplayStateList::const_iterator it = cached_displays_.begin();
-       it != cached_displays_.end();
-       ++it) {
+  for (const DisplaySnapshot* display : cached_displays_) {
     // Query display if it is in mirror mode or client on the same display.
-    if (!IsMirroring() && (*it)->display_id() != display_id)
+    if (!IsMirroring() && display->display_id() != display_id)
       continue;
 
-    *link_mask |= (*it)->type();
-    switch ((*it)->type()) {
+    *link_mask |= display->type();
+    switch (display->type()) {
       case DISPLAY_CONNECTION_TYPE_UNKNOWN:
         return false;
       // DisplayPort, DVI, and HDMI all support HDCP.
       case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
       case DISPLAY_CONNECTION_TYPE_DVI:
       case DISPLAY_CONNECTION_TYPE_HDMI: {
         HDCPState state;
-        if (!native_display_delegate_->GetHDCPState(**it, &state))
+        if (!native_display_delegate_->GetHDCPState(*display, &state))
           return false;
         if (state == HDCP_STATE_ENABLED)
           enabled |= CONTENT_PROTECTION_METHOD_HDCP;
         else
           unfulfilled |= CONTENT_PROTECTION_METHOD_HDCP;
         break;
       }
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
@@ skipping 19 matching lines @@
 }
 
 bool DisplayConfigurator::EnableContentProtection(
     ContentProtectionClientId client_id,
     int64_t display_id,
     uint32_t desired_method_mask) {
   if (!configure_display_ || display_externally_controlled_)
     return false;
 
   ContentProtections protections;
-  for (ProtectionRequests::const_iterator it =
-           client_protection_requests_.begin();
-       it != client_protection_requests_.end();
-       ++it) {
-    for (ContentProtections::const_iterator it2 = it->second.begin();
-         it2 != it->second.end();
-         ++it2) {
-      if (it->first == client_id && it2->first == display_id)
+  for (const auto& requests_pair : client_protection_requests_) {
+    for (const auto& protections_pair : requests_pair.second) {
+      if (requests_pair.first == client_id &&
+          protections_pair.first == display_id)
         continue;
-      protections[it2->first] |= it2->second;
+
+      protections[protections_pair.first] |= protections_pair.second;
     }
   }
   protections[display_id] |= desired_method_mask;
 
   if (!ApplyProtections(protections))
     return false;
 
   if (desired_method_mask == CONTENT_PROTECTION_METHOD_NONE) {
     if (client_protection_requests_.find(client_id) !=
         client_protection_requests_.end()) {
       client_protection_requests_[client_id].erase(display_id);
       if (client_protection_requests_[client_id].size() == 0)
         client_protection_requests_.erase(client_id);
     }
   } else {
     client_protection_requests_[client_id][display_id] = desired_method_mask;
   }
 
   return true;
 }
 
 std::vector<ui::ColorCalibrationProfile>
 DisplayConfigurator::GetAvailableColorCalibrationProfiles(int64_t display_id) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableDisplayColorCalibration)) {
-    for (size_t i = 0; i < cached_displays_.size(); ++i) {
-      if (cached_displays_[i]->display_id() == display_id) {
+    for (const DisplaySnapshot* display : cached_displays_) {
+      if (display->display_id() == display_id) {
         return native_display_delegate_->GetAvailableColorCalibrationProfiles(
-            *cached_displays_[i]);
+            *display);
       }
     }
   }
 
   return std::vector<ui::ColorCalibrationProfile>();
 }
 
 bool DisplayConfigurator::SetColorCalibrationProfile(
     int64_t display_id,
     ui::ColorCalibrationProfile new_profile) {
-  for (size_t i = 0; i < cached_displays_.size(); ++i) {
-    if (cached_displays_[i]->display_id() == display_id) {
-      return native_display_delegate_->SetColorCalibrationProfile(
-          *cached_displays_[i], new_profile);
+  for (const DisplaySnapshot* display : cached_displays_) {
+    if (display->display_id() == display_id) {
+      return native_display_delegate_->SetColorCalibrationProfile(*display,
+                                                                  new_profile);
     }
   }
 
   return false;
 }
 
 void DisplayConfigurator::PrepareForExit() {
   configure_display_ = false;
 }
 
@@ skipping 240 matching lines @@
     FOR_EACH_OBSERVER(
         Observer, observers_, OnDisplayModeChanged(cached_displays_));
   } else {
     FOR_EACH_OBSERVER(
         Observer, observers_, OnDisplayModeChangeFailed(cached_displays_,
                                                         attempted_state));
   }
 }
 
 }  // namespace ui