Add 1.6x mode.

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 15 matching lines @@
 
 namespace display {
 namespace {
 
 // Use larger than max int to catch overflow early.
 const int64_t kSynthesizedDisplayIdStart = 2200000000LL;
 
 int64_t synthesized_display_id = kSynthesizedDisplayIdStart;
 
 const float kDpi96 = 96.0;
-bool use_125_dsf_for_ui_scaling = true;
 
 // Check the content of |spec| and fill |bounds| and |device_scale_factor|.
 // Returns true when |bounds| is found.
 bool GetDisplayBounds(const std::string& spec,
                       gfx::Rect* bounds,
                       float* device_scale_factor) {
   int width = 0;
   int height = 0;
   int x = 0;
   int y = 0;
@@ skipping 92 matching lines @@
       is_interlaced_(is_interlaced),
       native_(native),
       ui_scale_(ui_scale),
       device_scale_factor_(device_scale_factor) {}
 
 gfx::Size ManagedDisplayMode::GetSizeInDIP(bool is_internal) const {
   gfx::SizeF size_dip(size_);
   size_dip.Scale(ui_scale_);
   // DSF=1.25 is special on internal display. The screen is drawn with DSF=1.25
   // but it doesn't affect the screen size computation.
-  if (use_125_dsf_for_ui_scaling && is_internal &&
-      device_scale_factor_ == 1.25f)
+  if (is_internal && device_scale_factor_ == 1.25f)
     return gfx::ToFlooredSize(size_dip);
   size_dip.Scale(1.0f / device_scale_factor_);
   return gfx::ToFlooredSize(size_dip);
 }
 
 bool ManagedDisplayMode::IsEquivalent(
     const scoped_refptr<ManagedDisplayMode>& other) const {
   const float kEpsilon = 0.0001f;
   return size_ == other->size_ &&
          std::abs(ui_scale_ - other->ui_scale_) < kEpsilon &&
@@ skipping 126 matching lines @@
     int height = bounds_in_native.height() / device_scale_factor / 40;
     display_info.SetOverscanInsets(gfx::Insets(height, width, height, width));
     display_info.UpdateDisplaySize();
   }
 
   DVLOG(1) << "DisplayInfoFromSpec info=" << display_info.ToString()
            << ", spec=" << spec;
   return display_info;
 }
 
-// static
-void ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
-  use_125_dsf_for_ui_scaling = enable;
-}
-
 ManagedDisplayInfo::ManagedDisplayInfo()
     : id_(kInvalidDisplayId),
       has_overscan_(false),
       active_rotation_source_(Display::ROTATION_SOURCE_UNKNOWN),
       touch_support_(Display::TOUCH_SUPPORT_UNKNOWN),
       has_touch_calibration_data_(false),
       device_scale_factor_(1.0f),
       device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
@@ skipping 192 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 use_125_dsf_for_ui_scaling && Display::IsInternalDisplayId(id_);
+  return Display::IsInternalDisplayId(id_);
 }
 
 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