Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 50ef6440e33fbfe8048b1cedb210c8cb40d9eb20..60b00c0878ed2a342a1feb11611b304532542f9c 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -412,11 +412,16 @@ RenderText::~RenderText() { |
} |
RenderText* RenderText::CreateInstance() { |
+#if defined(OS_MACOSX) && defined(TOOLKIT_VIEWS) |
+ // Use the more complete HarfBuzz implementation for Views controls on Mac. |
+ return new RenderTextHarfBuzz; |
+#else |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableHarfBuzzRenderText)) { |
return new RenderTextHarfBuzz; |
} |
return CreateNativeInstance(); |
+#endif |
} |
void RenderText::SetText(const base::string16& text) { |