linux/chromeos: Improve querying for Fontconfig defaults.

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 "base/command_line.h"
 #include "base/containers/mru_cache.h"
@@ skipping 105 matching lines @@
     FcPatternAddInteger(query_pattern, FC_WEIGHT,
         (query.style & Font::BOLD) ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL);
   }
 
   FcConfigSubstitute(NULL, query_pattern, FcMatchPattern);
   FcDefaultSubstitute(query_pattern);
 
   // If the query was non-empty, match a specific font and destroy the query
   // pattern. Otherwise, just use the query pattern.
   FcPattern* result_pattern = query_pattern;
-  if (!query.is_empty()) {
+  bool should_do_match = !query.is_empty();
+#if !defined(OS_CHROMEOS)
+  // Also perform a match for desktop Linux since many users don't have default
+  // patterns configured (http://crbug.com/442443, http://crbug.com/435277,

[msw, 2014/12/17 22:42:23]

optional nit: to avoid wrapping onto the next line: "configured:
http://crbug.com/442443, http://crbug.com/435277, etc."

[Daniel Erat, 2014/12/18 00:15:46]

Done.

+  // etc.).
+  should_do_match = true;
+#endif
+  if (should_do_match) {
     FcResult result;
     result_pattern = FcFontMatch(NULL, query_pattern, &result);
     FcPatternDestroy(query_pattern);
     query_pattern = NULL;
     if (!result_pattern)
       return false;
   }
 
   if (family_out) {
     FcChar8* family = NULL;
@@ skipping 130 matching lines @@
 float GetFontRenderParamsDeviceScaleFactor() {
   return device_scale_factor_for_internal_display;
 }
 
 void SetFontRenderParamsDeviceScaleFactor(float device_scale_factor) {
   device_scale_factor_for_internal_display = device_scale_factor;
 }
 #endif
 
 }  // namespace gfx