Cleanup: Enable 125DSFForUIScaling on by default

ash/display/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 <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/win/dpi.h"
 #endif
 
 namespace ash {
 namespace {
 
-bool use_125_dsf_for_ui_scaling = false;
+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;
   if (sscanf(spec.c_str(), "%dx%d*%f",
@@ skipping 16 matching lines @@
     gfx::Size size_a_dip = a.GetSizeInDIP(is_internal);
     gfx::Size size_b_dip = b.GetSizeInDIP(is_internal);
     if (size_a_dip.GetArea() == size_b_dip.GetArea())
       return (a.refresh_rate > b.refresh_rate);
     return (size_a_dip.GetArea() < size_b_dip.GetArea());
   }
 
   bool is_internal;
 };
 
+bool IsInternalDisplayId(int64 id) {
+  return id == gfx::Display::InternalDisplayId() &&
+         id != gfx::Display::kInvalidDisplayID;
+}
+
 }  // namespace
 
 DisplayMode::DisplayMode()
     : refresh_rate(0.0f),
       interlaced(false),
       native(false),
       ui_scale(1.0f),
       device_scale_factor(1.0f) {}
 
 DisplayMode::DisplayMode(const gfx::Size& size,
                          float refresh_rate,
                          bool interlaced,
                          bool native)
     : size(size),
       refresh_rate(refresh_rate),
       interlaced(interlaced),
       native(native),
       ui_scale(1.0f),
       device_scale_factor(1.0f) {}
 
 gfx::Size DisplayMode::GetSizeInDIP(bool is_internal) const {
   gfx::SizeF size_dip(size);
   size_dip.Scale(ui_scale);
-  // DSF=1.25 is special. The screen is drawn with DSF=1.25 in some mode but it
-  // doesn't affect the screen size computation.
-  if (!(use_125_dsf_for_ui_scaling && is_internal) ||
-      device_scale_factor != 1.25f) {
-    size_dip.Scale(1.0f / device_scale_factor);
-  }
+  // 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 (is_internal && device_scale_factor == 1.25f)

[Jun Mukai, 2015/07/22 00:51:11]

doesn't use_125_dsf_for_ui_scaling affect this behavior anymore?

[oshima, 2015/07/22 01:09:24]

Done.

+    return gfx::ToFlooredSize(size_dip);
+  size_dip.Scale(1.0f / device_scale_factor);
   return gfx::ToFlooredSize(size_dip);
 }
 
 bool DisplayMode::IsEquivalent(const DisplayMode& other) const {
   const float kEpsilon = 0.0001f;
   return size == other.size &&
       std::abs(ui_scale - other.ui_scale) < kEpsilon &&
       std::abs(device_scale_factor - other.device_scale_factor) < kEpsilon;
 }
 
 // satic
 DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
   return CreateFromSpecWithID(spec, gfx::Display::kInvalidDisplayID);
 }
 
 // static
-void DisplayInfo::SetUse125DSFForUIScaling(bool enable) {
-  use_125_dsf_for_ui_scaling = enable;
-}
-
-// static
 DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
                                               int64 id) {
   // Use larger than max int to catch overflow early.
   static int64 synthesized_display_id = 2200000000LL;
 
 #if defined(OS_WIN)
   gfx::Rect bounds_in_native(aura::WindowTreeHost::GetNativeScreenSize());
 #else
   // Default bounds for a display.
   const int kDefaultHostWindowX = 200;
@@ skipping 100 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 DisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
+  use_125_dsf_for_ui_scaling = enable;
+}
+
 DisplayInfo::DisplayInfo()
     : id_(gfx::Display::kInvalidDisplayID),
       has_overscan_(false),
       touch_support_(gfx::Display::TOUCH_SUPPORT_UNKNOWN),
       touch_device_id_(0),
       device_scale_factor_(1.0f),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
@@ skipping 70 matching lines @@
   }
 }
 
 void DisplayInfo::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 DisplayInfo::GetEffectiveDeviceScaleFactor() const {
-  if (Use125DSFRorUIScaling() && device_scale_factor_ == 1.25f)
+  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 DisplayInfo::GetEffectiveUIScale() const {
-  if (Use125DSFRorUIScaling() && device_scale_factor_ == 1.25f)
+  if (Use125DSFForUIScaling() && device_scale_factor_ == 1.25f)
     return (configured_ui_scale_ == 0.8f) ? 1.0f : configured_ui_scale_;
   if (device_scale_factor_ == configured_ui_scale_)
     return 1.0f;
   return configured_ui_scale_;
 }
 
 void DisplayInfo::UpdateDisplaySize() {
   size_in_pixel_ = bounds_in_native_.size();
   if (!overscan_insets_in_dip_.empty()) {
     gfx::Insets insets_in_pixel =
@@ skipping 17 matching lines @@
 }
 
 gfx::Insets DisplayInfo::GetOverscanInsetsInPixel() const {
   return overscan_insets_in_dip_.Scale(device_scale_factor_);
 }
 
 void DisplayInfo::SetDisplayModes(
     const std::vector<DisplayMode>& display_modes) {
   display_modes_ = display_modes;
   std::sort(display_modes_.begin(), display_modes_.end(),
-            DisplayModeSorter(id_ == gfx::Display::InternalDisplayId()));
+            DisplayModeSorter(IsInternalDisplayId(id_)));
 }
 
 gfx::Size DisplayInfo::GetNativeModeSize() const {
   for (size_t i = 0; i < display_modes_.size(); ++i) {
     if (display_modes_[i].native)
       return display_modes_[i].size;
   }
 
   return gfx::Size();
 }
@@ skipping 41 matching lines @@
     color_profile_ = profile;
 }
 
 bool DisplayInfo::IsColorProfileAvailable(
     ui::ColorCalibrationProfile profile) const {
   return std::find(available_color_profiles_.begin(),
                    available_color_profiles_.end(),
                    profile) != available_color_profiles_.end();
 }
 
-bool DisplayInfo::Use125DSFRorUIScaling() const {
-  return use_125_dsf_for_ui_scaling && id_ == gfx::Display::InternalDisplayId();
+bool DisplayInfo::Use125DSFForUIScaling() const {
+  return use_125_dsf_for_ui_scaling && IsInternalDisplayId(id_);
 }
 
 }  // namespace ash