Retrieve and pass subpixel lcd geometry on windows

ui/gfx/font_render_params.cc

Index: ui/gfx/font_render_params.cc
diff --git a/ui/gfx/font_render_params.cc b/ui/gfx/font_render_params.cc
index 7297cdcb9dfda25f77b90a526d9a3db99ff91536..ce9ea7cb60d7783c181a5c5a09406d9b3320e95d 100644
--- a/ui/gfx/font_render_params.cc
+++ b/ui/gfx/font_render_params.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/font_render_params.h"
 
+#include "base/logging.h"
+
 namespace gfx {
 
 FontRenderParams::FontRenderParams()
@@ -17,6 +19,41 @@ FontRenderParams::FontRenderParams()
 
 FontRenderParams::~FontRenderParams() {}
 
+// static
+SkFontHost::LCDOrder FontRenderParams::SubpixelRenderingToSkiaLCDOrder(
+    FontRenderParams::SubpixelRendering subpixel_rendering) {
+  switch (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:

[msw, 2015/03/26 20:41:25]

nit: omit default case to get compile errors instead; drop logging.h

[scottmg, 2015/03/26 21:16:16]

I can never figure out which compiler wants what. If I remove the default:s on
Windows, I get:

[4704->175/4912 ~33] CXX obj\ui\gfx\gfx.font_render_params.obj
FAILED: ninja -t msvc -e environment.x86 --
"d:\src\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\ui\gfx\gfx.font_render_params.obj.rsp /c
..\..\ui\gfx\font_render_params.cc /Foobj\ui\gfx\gfx.font_render_params.obj
/Fdobj\ui\gfx\gfx.cc.pdb
d:\src\cr3\src\ui\gfx\font_render_params.cc(32) : error C2220: warning treated
as error - no 'object' file generated
d:\src\cr3\src\ui\gfx\font_render_params.cc(47) : error C2220: warning treated
as error - no 'object' file generated
d:\src\cr3\src\ui\gfx\font_render_params.cc(32) : warning C4715:
'gfx::FontRenderParams::SubpixelRenderingToSkiaLCDOrder' : not all control paths
return a value
d:\src\cr3\src\ui\gfx\font_render_params.cc(47) : warning C4715:
'gfx::FontRenderParams::SubpixelRenderingToSkiaLCDOrientation' : not all control
paths return
a value

But I think if I just have a return after the switch, clang might complain about
unreachable code (and then I'd probably want a NOTREACHED() there anyway too).
Do you prefer this version?

[msw, 2015/03/26 21:56:02]

Yeah, I prefer the newer version, but you can go either way, it's a nit.

+      NOTREACHED();
+      return SkFontHost::kRGB_LCDOrder;
+  }
+}
+
+// static
+SkFontHost::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 SkFontHost::kHorizontal_LCDOrientation;
+    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VRGB:
+    case gfx::FontRenderParams::SUBPIXEL_RENDERING_VBGR:
+      return SkFontHost::kVertical_LCDOrientation;
+    default:

[msw, 2015/03/26 20:41:25]

nit: omit default case to get compile errors instead; drop logging.h

[scottmg, 2015/03/26 21:16:16]

As above.

+      NOTREACHED();
+      return SkFontHost::kHorizontal_LCDOrientation;
+  }
+}
+
 FontRenderParamsQuery::FontRenderParamsQuery(bool for_web_contents)
     : for_web_contents(for_web_contents),
       pixel_size(0),