Chromium change of sharing some WebKit API between Android/Linux.

chrome/browser/renderer_preferences_util.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 "chrome/browser/renderer_preferences_util.h"
 
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/common/renderer_preferences.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_ANDROID)
 #include "ui/gfx/font_render_params_linux.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "ui/gfx/gtk_util.h"
 #endif
 
 namespace renderer_preferences_util {
 
 namespace {
 
 #if defined(TOOLKIT_GTK)
 // Dividing GTK's cursor blink cycle time (in milliseconds) by this value yields
 // an appropriate value for content::RendererPreferences::caret_blink_interval.
 // This matches the logic in the WebKit GTK port.
 const double kGtkCursorBlinkCycleFactor = 2000.0;
 #endif  // defined(TOOLKIT_GTK)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_ANDROID)
 content::RendererPreferencesHintingEnum GetRendererPreferencesHintingEnum(
     gfx::FontRenderParams::Hinting hinting) {
   switch (hinting) {
     case gfx::FontRenderParams::HINTING_NONE:
       return content::RENDERER_PREFERENCES_HINTING_NONE;
     case gfx::FontRenderParams::HINTING_SLIGHT:
       return content::RENDERER_PREFERENCES_HINTING_SLIGHT;
     case gfx::FontRenderParams::HINTING_MEDIUM:
       return content::RENDERER_PREFERENCES_HINTING_MEDIUM;
     case gfx::FontRenderParams::HINTING_FULL:
@@ skipping 17 matching lines @@
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
       return content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB;
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
       return content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR;
     default:
       NOTREACHED() << "Unhandled subpixel rendering style "
                    << subpixel_rendering;
       return content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT;
   }
 }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
 }  // namespace
 
 void UpdateFromSystemSettings(
     content::RendererPreferences* prefs, Profile* profile) {
   const PrefService* pref_service = profile->GetPrefs();
   prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
   prefs->default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel);
 
 #if defined(TOOLKIT_GTK)
@@ skipping 17 matching lines @@
       cursor_blink_time.InMilliseconds() / kGtkCursorBlinkCycleFactor :
       0;
 #elif defined(USE_ASH)
   // This color is 0x544d90fe modulated with 0xffffff.
   prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
   prefs->active_selection_fg_color = SK_ColorBLACK;
   prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
   prefs->inactive_selection_fg_color = SK_ColorBLACK;
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_ANDROID)
   const gfx::FontRenderParams& params = gfx::GetDefaultFontRenderParams();
   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);
 #endif
 }
 
 }  // renderer_preferences_util