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

content/renderer/render_view_linuxish.cc

Index: content/renderer/render_view_linuxish.cc
diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linuxish.cc
similarity index 95%
rename from content/renderer/render_view_linux.cc
rename to content/renderer/render_view_linuxish.cc
index ca35529cd6ea91bd4652d895e235c020fdcfc2a2..eda0e89abf4d5c5d96b7074f612d6c08c2329ac6 100644
--- a/content/renderer/render_view_linux.cc
+++ b/content/renderer/render_view_linuxish.cc
@@ -5,10 +5,8 @@
 #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(
@@ -110,5 +108,4 @@ void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
   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(...)

 }