linux_aura: Enable HIDPI support

ash/display/display_change_observer_chromeos.cc

 // Copyright 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 "ash/display/display_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chromeos/display/output_util.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace internal {
 
 using chromeos::OutputConfigurator;
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 const unsigned int kHighDensityDPIThreshold = 160;
 
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
-// A list of bogus sizes in mm that X detects that should be ignored.
-// See crbug.com/136533. The first element maintains the minimum
-// size required to be valid size.
-const unsigned long kInvalidDisplaySizeList[][2] = {
-  {40, 30},
-  {50, 40},
-  {160, 90},
-  {160, 100},
-};
-
 // Resolution list are sorted by the area in pixels and the larger
 // one comes first.
 struct ResolutionSorter {
   bool operator()(const Resolution& a, const Resolution& b) {
     return a.size.width() * a.size.height() > b.size.width() * b.size.height();
   }
 };
 
 }  // namespace
 
 // static
-bool DisplayChangeObserver::ShouldIgnoreSize(unsigned long mm_width,
-                                             unsigned long mm_height) {
-  // Ignore if the reported display is smaller than minimum size.
-  if (mm_width <= kInvalidDisplaySizeList[0][0] ||
-      mm_height <= kInvalidDisplaySizeList[0][1]) {
-    LOG(WARNING) << "Smaller than minimum display size";
-    return true;
-  }
-  for (unsigned long i = 1 ; i < arraysize(kInvalidDisplaySizeList); ++i) {
-    const unsigned long* size = kInvalidDisplaySizeList[i];
-    if (mm_width == size[0] && mm_height == size[1]) {
-      LOG(WARNING) << "Black listed display size detected:"
-                   << size[0] << "x" << size[1];
-      return true;
-    }
-  }
-  return false;
-}
-
-// static
 std::vector<Resolution> DisplayChangeObserver::GetResolutionList(
     const OutputConfigurator::OutputSnapshot& output) {
   typedef std::map<std::pair<int,int>, Resolution> ResolutionMap;
   ResolutionMap resolution_map;
 
   for (std::map<RRMode, OutputConfigurator::ModeInfo>::const_iterator it =
        output.mode_infos.begin(); it != output.mode_infos.end(); ++it) {
     const OutputConfigurator::ModeInfo& mode_info = it->second;
     const std::pair<int, int> size(mode_info.width, mode_info.height);
     const Resolution resolution(gfx::Size(mode_info.width, mode_info.height),
@@ skipping 69 matching lines @@
           output.display_id == gfx::Display::kInvalidDisplayID ? output.index :
           output.display_id);
     }
 
     const OutputConfigurator::ModeInfo* mode_info =
         OutputConfigurator::GetModeInfo(output, output.current_mode);
     if (!mode_info)
       continue;
 
     float device_scale_factor = 1.0f;
-    if (!ShouldIgnoreSize(output.width_mm, output.height_mm) &&
+    if (!ui::IsXDisplaySizeBlackListed(output.width_mm, output.height_mm) &&
         (kInchInMm * mode_info->width / output.width_mm) >
         kHighDensityDPIThreshold) {
       device_scale_factor = 2.0f;
     }
     gfx::Rect display_bounds(
         output.x, output.y, mode_info->width, mode_info->height);
 
     std::vector<Resolution> resolutions;
     if (!output.is_internal)
       resolutions = GetResolutionList(output);
@@ skipping 29 matching lines @@
 void DisplayChangeObserver::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
   Shell::GetInstance()->output_configurator()->Stop();
 #endif
 }
 
 }  // namespace internal
 }  // namespace ash