Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 50ef6440e33fbfe8048b1cedb210c8cb40d9eb20..1a91b98878a0b61746fa398c5a9f75dcf82485ba 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -412,11 +412,17 @@ RenderText::~RenderText() { |
} |
RenderText* RenderText::CreateInstance() { |
+#if defined(OS_MACOSX) && defined(TOOLKIT_VIEWS) |
+ // views::Textfield requires RenderTextHarfBuzz on Mac because RenderTextMac's |
msw
2014/06/10 23:23:47
nit: Textfield is the heaviest user, but I'm plann
|
+ // implementation is not complete. |
+ return new RenderTextHarfBuzz; |
+#else |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableHarfBuzzRenderText)) { |
return new RenderTextHarfBuzz; |
} |
return CreateNativeInstance(); |
+#endif |
} |
void RenderText::SetText(const base::string16& text) { |