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

content/renderer/render_view_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 "content/renderer/render_view_impl.h"
 
 #include "content/public/common/renderer_preferences.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRendering.h"
 
-using WebKit::WebFontInfo;
 using WebKit::WebFontRendering;
 
 static SkPaint::Hinting RendererPreferencesToSkiaHinting(
     const content::RendererPreferences& prefs) {
   if (!prefs.should_antialias_text) {
     // When anti-aliasing is off, GTK maps all non-zero hinting settings to
     // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
     // hinting selected will see readable text in everything expect Chromium.
     switch (prefs.hinting) {
       case content::RENDERER_PREFERENCES_HINTING_NONE:
@@ skipping 73 matching lines @@
       prefs.subpixel_rendering !=
         content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE) {
     return true;
   }
   return false;
 }
 
 void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
   const content::RendererPreferences& prefs = renderer_preferences_;
   WebFontRendering::setHinting(RendererPreferencesToSkiaHinting(prefs));
+  WebFontRendering::setAutoHint(prefs.use_autohinter);
+  WebFontRendering::setUseBitmaps(prefs.use_bitmaps);
   WebFontRendering::setLCDOrder(
       RendererPreferencesToSkiaLCDOrder(prefs.subpixel_rendering));
   WebFontRendering::setLCDOrientation(
       RendererPreferencesToSkiaLCDOrientation(prefs.subpixel_rendering));
   WebFontRendering::setAntiAlias(RendererPreferencesToAntiAliasFlag(prefs));
   WebFontRendering::setSubpixelRendering(
       RendererPreferencesToSubpixelRenderingFlag(prefs));
   WebFontRendering::setSubpixelPositioning(prefs.use_subpixel_positioning);
-  WebFontInfo::setSubpixelPositioning(prefs.use_subpixel_positioning);
 }