1 files changed, 7 insertions, 22 deletions
diff --git a/chromium/ui/gfx/font_render_params.cc b/chromium/ui/gfx/font_render_params.cc
index 3a03ffcc9f6..31799c8674f 100644
--- a/chromium/ui/gfx/font_render_params.cc
+++ b/chromium/ui/gfx/font_render_params.cc
@@ -9,38 +9,23 @@
 namespace gfx {
 
 // static
-SkFontLCDConfig::LCDOrder FontRenderParams::SubpixelRenderingToSkiaLCDOrder(
+SkPixelGeometry FontRenderParams::SubpixelRenderingToSkiaPixelGeometry(
     FontRenderParams::SubpixelRendering subpixel_rendering) {
   switch (subpixel_rendering) {
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE:
+      return kRGB_H_SkPixelGeometry;  // why not kUnknown_SkPixelGeometry ??
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_RGB:
+      return kRGB_H_SkPixelGeometry;
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
-      return SkFontLCDConfig::kRGB_LCDOrder;
+      return kRGB_V_SkPixelGeometry;
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_BGR:
+      return kBGR_H_SkPixelGeometry;
     case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
-      return SkFontLCDConfig::kBGR_LCDOrder;
+      return kBGR_V_SkPixelGeometry;
   }
 
   NOTREACHED();
-  return SkFontLCDConfig::kRGB_LCDOrder;
-}
-
-// static
-SkFontLCDConfig::LCDOrientation
-FontRenderParams::SubpixelRenderingToSkiaLCDOrientation(
-    FontRenderParams::SubpixelRendering subpixel_rendering) {
-  switch (subpixel_rendering) {
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_RGB:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_BGR:
-      return SkFontLCDConfig::kHorizontal_LCDOrientation;
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
-    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
-      return SkFontLCDConfig::kVertical_LCDOrientation;
-  }
-
-  NOTREACHED();
-  return SkFontLCDConfig::kHorizontal_LCDOrientation;
+  return kRGB_H_SkPixelGeometry;
 }
 
 FontRenderParamsQuery::FontRenderParamsQuery()