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

content/renderer/render_view_linuxish.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"
+#include "third_party/WebKit/Source/WebKit/chromium/public/linuxish/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 81 matching lines @@
   const content::RendererPreferences& prefs = renderer_preferences_;
   WebFontRendering::setHinting(RendererPreferencesToSkiaHinting(prefs));
   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);

[Daniel Erat, 2012/06/14 23:44:20]

Was this a merge error?  I just added this code.

[Xianzhu, 2012/06/15 00:05:00]

In https://bugs.webkit.org/show_bug.cgi?id=89133 I changed
WebKit::WebFontRendering::setSubpixelPositioning() to call
WebFontInfo::setSubpixelPositioning() to avoid calling both everywhere. The
reason of changing this is that WebFontInfo uses fontconfig which is not
available on Android. Otherwise we would need the following code in several
places:

#if !defined(OS_ANDROID)
  WebFontInfo::setSubpixelPositioning(...)
#endif
  WebFontRendering::setSubpixelPositioning(...)

 }