Remove screen dependency from font_render_params_linux

ui/gfx/font_render_params_linux.cc

 // Copyright (c) 2012 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/gfx/font_render_params.h"
 
 #include <fontconfig/fontconfig.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/mru_cache.h"
 #include "base/hash.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/linux_font_delegate.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/switches.h"
 
 namespace gfx {
 
 namespace {
 
-#if defined(OS_CHROMEOS)
-// A device scale factor for an internal display (if any)
-// that is used to determine if subpixel positioning should be used.
-float device_scale_factor_for_internal_display = 1.0f;
-#endif
+// A device scale factor used to determine if subpixel positioning
+// should be used.
+float device_scale_factor_ = 1.0f;
 
 // Number of recent GetFontRenderParams() results to cache.
 const size_t kCacheSize = 256;
 
 // Cached result from a call to GetFontRenderParams().
 struct QueryResult {
   QueryResult(const FontRenderParams& params, const std::string& family)
       : params(params),
         family(family) {
   }
@@ skipping 150 matching lines @@
       "%d|%d|%d|%s|%f", query.pixel_size, query.point_size, query.style,
       base::JoinString(query.families, ",").c_str(),
       query.device_scale_factor));
 }
 
 }  // namespace
 
 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
                                      std::string* family_out) {
   FontRenderParamsQuery actual_query(query);
-  if (actual_query.device_scale_factor == 0) {
-#if defined(OS_CHROMEOS)
-    actual_query.device_scale_factor = device_scale_factor_for_internal_display;
-#else
-    // Linux does not support per-display DPI, so we use a slightly simpler
-    // code path than on Chrome OS to figure out the device scale factor.
-    gfx::Screen* screen = gfx::Screen::GetScreen();
-    if (screen) {
-      gfx::Display display = screen->GetPrimaryDisplay();
-      actual_query.device_scale_factor = display.device_scale_factor();
-    }
-#endif
-  }
+  if (actual_query.device_scale_factor == 0)
+    actual_query.device_scale_factor = device_scale_factor_;
+
   const uint32_t hash = HashFontRenderParamsQuery(actual_query);
   SynchronizedCache* synchronized_cache = g_synchronized_cache.Pointer();
 
   {
     // Try to find a cached result so Fontconfig doesn't need to be queried.
     base::AutoLock lock(synchronized_cache->lock);
     Cache::const_iterator it = synchronized_cache->cache.Get(hash);
     if (it != synchronized_cache->cache.end()) {
       DVLOG(1) << "Returning cached params for " << hash;
       const QueryResult& result = it->second;
@@ skipping 42 matching lines @@
 
   return params;
 }
 
 void ClearFontRenderParamsCacheForTest() {
   SynchronizedCache* synchronized_cache = g_synchronized_cache.Pointer();
   base::AutoLock lock(synchronized_cache->lock);
   synchronized_cache->cache.Clear();
 }
 
-#if defined(OS_CHROMEOS)
 float GetFontRenderParamsDeviceScaleFactor() {
-  return device_scale_factor_for_internal_display;
+  return device_scale_factor_;
 }
 
 void SetFontRenderParamsDeviceScaleFactor(float device_scale_factor) {
-  device_scale_factor_for_internal_display = device_scale_factor;
+  device_scale_factor_ = device_scale_factor;
 }
-#endif
 
 }  // namespace gfx