Add FontRenderParamsQuery.

android_webview/native/aw_settings.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 "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/macros.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/web_preferences.h"
 #include "jni/AwSettings_jni.h"
 #include "ui/gfx/font_render_params.h"
 
@@ skipping 45 matching lines @@
                    << subpixel_rendering;
       return content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT;
   }
 }
 
 void PopulateFixedRendererPreferences(RendererPreferences* prefs) {
   prefs->tap_multiple_targets_strategy =
       content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE;
 
   // TODO(boliu): Deduplicate with chrome/ code.
-  const gfx::FontRenderParams& params = gfx::GetDefaultWebKitFontRenderParams();
+  CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
   prefs->should_antialias_text = params.antialiasing;
   prefs->use_subpixel_positioning = params.subpixel_positioning;
   prefs->hinting = GetRendererPreferencesHintingEnum(params.hinting);
   prefs->use_autohinter = params.autohinter;
   prefs->use_bitmaps = params.use_bitmaps;
   prefs->subpixel_rendering =
       GetRendererPreferencesSubpixelRenderingEnum(params.subpixel_rendering);
 }
 
 void PopulateFixedWebPreferences(WebPreferences* web_prefs) {
@@ skipping 356 matching lines @@
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview