Retrieve and pass subpixel lcd geometry on windows

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/public/web/linux/WebFontRendering.h"
+#include "ui/gfx/font_render_params.h"
 
 using blink::WebFontRendering;
 
 namespace content {
 
 namespace {
 
 SkPaint::Hinting RendererPreferencesToSkiaHinting(
     const RendererPreferences& prefs) {
   if (!prefs.should_antialias_text) {
@@ skipping 17 matching lines @@
     case gfx::FontRenderParams::HINTING_NONE:   return SkPaint::kNo_Hinting;
     case gfx::FontRenderParams::HINTING_SLIGHT: return SkPaint::kSlight_Hinting;
     case gfx::FontRenderParams::HINTING_MEDIUM: return SkPaint::kNormal_Hinting;
     case gfx::FontRenderParams::HINTING_FULL:   return SkPaint::kFull_Hinting;
     default:
       NOTREACHED();
       return SkPaint::kNormal_Hinting;
     }
 }
 
-SkFontHost::LCDOrder RendererPreferencesToSkiaLCDOrder(
-    const RendererPreferences& prefs) {
-  switch (prefs.subpixel_rendering) {
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_RGB:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
-      return SkFontHost::kRGB_LCDOrder;
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_BGR:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
-      return SkFontHost::kBGR_LCDOrder;
-    default:
-      NOTREACHED();
-      return SkFontHost::kRGB_LCDOrder;
-  }
-}
-
-SkFontHost::LCDOrientation RendererPreferencesToSkiaLCDOrientation(
-    const RendererPreferences& prefs) {
-  switch (prefs.subpixel_rendering) {
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_RGB:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_BGR:
-      return SkFontHost::kHorizontal_LCDOrientation;
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
-      return SkFontHost::kVertical_LCDOrientation;
-    default:
-      NOTREACHED();
-      return SkFontHost::kHorizontal_LCDOrientation;
-  }
-}
-
 }  // namespace
 
 void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
   const RendererPreferences& prefs = renderer_preferences_;
   WebFontRendering::setHinting(RendererPreferencesToSkiaHinting(prefs));
   WebFontRendering::setAutoHint(prefs.use_autohinter);
   WebFontRendering::setUseBitmaps(prefs.use_bitmaps);
-  WebFontRendering::setLCDOrder(RendererPreferencesToSkiaLCDOrder(prefs));
+  WebFontRendering::setLCDOrder(
+      gfx::FontRenderParams::SubpixelRenderingToSkiaLCDOrder(
+          prefs.subpixel_rendering));
   WebFontRendering::setLCDOrientation(
-      RendererPreferencesToSkiaLCDOrientation(prefs));
+      gfx::FontRenderParams::SubpixelRenderingToSkiaLCDOrientation(
+          prefs.subpixel_rendering));
   WebFontRendering::setAntiAlias(prefs.should_antialias_text);
   WebFontRendering::setSubpixelRendering(
       prefs.subpixel_rendering !=
       gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
   WebFontRendering::setSubpixelPositioning(prefs.use_subpixel_positioning);
 }
 
 }  // namespace content