exo: Fix cursor scaling for 1.25 DSF

ui/display/manager/managed_display_info.cc

 // Copyright (c) 2013 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/manager/managed_display_info.h"
 
 #include <stdio.h>
 
 #include <string>
 #include <vector>
@@ skipping 375 matching lines @@
     color_profile_ = native_info.color_profile();
   }
 }
 
 void ManagedDisplayInfo::SetBounds(const gfx::Rect& new_bounds_in_native) {
   bounds_in_native_ = new_bounds_in_native;
   size_in_pixel_ = new_bounds_in_native.size();
   UpdateDisplaySize();
 }
 
+float ManagedDisplayInfo::GetDensityRatio() const {
+  if (Use125DSFForUIScaling() && device_scale_factor_ == 1.25f)
+    return 1.0f;
+  return device_scale_factor_;
+}
+
 float ManagedDisplayInfo::GetEffectiveDeviceScaleFactor() const {
   if (Use125DSFForUIScaling() && device_scale_factor_ == 1.25f)
     return (configured_ui_scale_ == 0.8f) ? 1.25f : 1.0f;
   if (device_scale_factor_ == configured_ui_scale_)
     return 1.0f;
   return device_scale_factor_;
 }
 
 float ManagedDisplayInfo::GetEffectiveUIScale() const {
   if (Use125DSFForUIScaling() && device_scale_factor_ == 1.25f)
@@ skipping 91 matching lines @@
   if (IsColorProfileAvailable(profile))
     color_profile_ = profile;
 }
 
 bool ManagedDisplayInfo::IsColorProfileAvailable(
     ColorCalibrationProfile profile) const {
   return base::ContainsValue(available_color_profiles_, profile);
 }
 
 bool ManagedDisplayInfo::Use125DSFForUIScaling() const {
-  return Display::IsInternalDisplayId(id_);
+  return id_ != kInvalidDisplayId && Display::IsInternalDisplayId(id_);

[oshima, 2017/06/23 23:57:14]

why this is necessary?

[Dominik Laskowski, 2017/06/23 23:59:13]

So GetDensityRatio does not DCHECK on a default-constructed ManagedDisplayInfo.

 }
 
 void ManagedDisplayInfo::AddInputDevice(int id) {
   input_devices_.push_back(id);
 }
 
 void ManagedDisplayInfo::ClearInputDevices() {
   input_devices_.clear();
 }
 
 void ResetDisplayIdForTest() {
   synthesized_display_id = kSynthesizedDisplayIdStart;
 }
 
 void ManagedDisplayInfo::SetTouchCalibrationData(
     const TouchCalibrationData& touch_calibration_data) {
   has_touch_calibration_data_ = true;
   touch_calibration_data_ = touch_calibration_data;
 }
 
 }  // namespace display