[Ozone-DRI] Fix panel fitting lookup

ui/ozone/platform/dri/display_snapshot_dri.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/display_snapshot_dri.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <xf86drmMode.h>
 
@@ skipping 25 matching lines @@
     case DRM_MODE_CONNECTOR_HDMIA:
     case DRM_MODE_CONNECTOR_HDMIB:
       return DISPLAY_CONNECTION_TYPE_HDMI;
     default:
       return DISPLAY_CONNECTION_TYPE_UNKNOWN;
   }
 }
 
 bool IsAspectPreserving(DriWrapper* drm, drmModeConnector* connector) {
   ScopedDrmPropertyPtr property(drm->GetProperty(connector, "scaling mode"));
-  if (property) {
-    for (int j = 0; j < property->count_enums; ++j) {
-      if (property->enums[j].value ==
-              connector->prop_values[property->prop_id] &&
-          strcmp(property->enums[j].name, "Full aspect") == 0)
+  if (!property)
+    return false;
+
+  for (int props_i = 0; props_i < connector->count_props; ++props_i) {
+    if (connector->props[props_i] != property->prop_id)
+      continue;
+
+    for (int enums_i = 0; enums_i < property->count_enums; ++enums_i) {
+      if (property->enums[enums_i].value == connector->prop_values[props_i] &&
+          strcmp(property->enums[enums_i].name, "Full aspect") == 0)
         return true;
     }
   }
 
   return false;
 }
 
 }  // namespace
 
 DisplaySnapshotDri::DisplaySnapshotDri(DriWrapper* drm,
@@ skipping 57 matching lines @@
   return base::StringPrintf(
       "[type=%d, connector=%" PRIu32 ", crtc=%" PRIu32 ", mode=%s, dim=%s]",
       type_,
       connector_,
       crtc_,
       current_mode_ ? current_mode_->ToString().c_str() : "NULL",
       physical_size_.ToString().c_str());
 }
 
 }  // namespace ui