native_viewport support for ozone

ui/ozone/platform/drm/common/drm_util.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/drm/common/drm_util.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <xf86drmMode.h>
@@ skipping 98 matching lines @@
 
     if (name == tmp->name) {
       *property = tmp.Pass();
       return i;
     }
   }
 
   return -1;
 }
 
-std::string GetNameForEnumValue(drmModePropertyRes* property, uint32_t value) {
-  for (int i = 0; i < property->count_enums; ++i)
-    if (property->enums[i].value == value)
-      return property->enums[i].name;
-
-  return std::string();
-}
-
 ScopedDrmPropertyBlobPtr GetDrmPropertyBlob(int fd,
                                             drmModeConnector* connector,
                                             const std::string& name) {
   ScopedDrmPropertyPtr property;
   int index = GetDrmProperty(fd, connector, name, &property);
   if (index < 0)
     return nullptr;
 
   if (property->flags & DRM_MODE_PROP_BLOB) {
     return ScopedDrmPropertyBlobPtr(
         drmModeGetPropertyBlob(fd, connector->prop_values[index]));
   }
 
   return nullptr;
 }
 
-bool IsAspectPreserving(int fd, drmModeConnector* connector) {
-  ScopedDrmPropertyPtr property;
-  int index = GetDrmProperty(fd, connector, "scaling mode", &property);
-  if (index < 0)
-    return false;
-
-  return (GetNameForEnumValue(property.get(), connector->prop_values[index]) ==
-          "Full aspect");
-}
-
 }  // namespace
 
 HardwareDisplayControllerInfo::HardwareDisplayControllerInfo(
     ScopedDrmConnectorPtr connector,
     ScopedDrmCrtcPtr crtc)
     : connector_(connector.Pass()), crtc_(crtc.Pass()) {
 }
 
 HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() {
 }
@@ skipping 47 matching lines @@
     HardwareDisplayControllerInfo* info,
     int fd,
     size_t display_index,
     const gfx::Point& origin) {
   DisplaySnapshot_Params params;
   params.display_id = display_index;
   params.origin = origin;
   params.physical_size =
       gfx::Size(info->connector()->mmWidth, info->connector()->mmHeight);
   params.type = GetDisplayType(info->connector());
-  params.is_aspect_preserving_scaling =
-      IsAspectPreserving(fd, info->connector());
 
   ScopedDrmPropertyBlobPtr edid_blob(
       GetDrmPropertyBlob(fd, info->connector(), "EDID"));
 
   if (edid_blob) {
     std::vector<uint8_t> edid(
         static_cast<uint8_t*>(edid_blob->data),
         static_cast<uint8_t*>(edid_blob->data) + edid_blob->length);
 
     if (!GetDisplayIdFromEDID(edid, display_index, &params.display_id,
                               &params.product_id))
       params.display_id = display_index;
-
-    ParseOutputDeviceData(edid, nullptr, nullptr, &params.display_name, nullptr,
-                          nullptr);
-    ParseOutputOverscanFlag(edid, &params.has_overscan);
   } else {
     VLOG(1) << "Failed to get EDID blob for connector "
             << info->connector()->connector_id;
   }
 
   for (int i = 0; i < info->connector()->count_modes; ++i) {
     const drmModeModeInfo& mode = info->connector()->modes[i];
     params.modes.push_back(CreateDisplayModeParams(mode));
 
     if (info->crtc()->mode_valid && SameMode(info->crtc()->mode, mode)) {
@@ skipping 11 matching lines @@
   // since it should be the best mode.
   if (!params.has_native_mode && !params.modes.empty()) {
     params.has_native_mode = true;
     params.native_mode = params.modes.front();
   }
 
   return params;
 }
 
 }  // namespace ui