Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 1ca874a0e461f2014c5568c4fcfeb0802bba7fcc..6f6ce27eb008203bacf18b692e5e796d9fa988a4 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -398,9 +398,13 @@ RenderText::~RenderText() { |
} |
RenderText* RenderText::CreateInstance() { |
+#if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS) |
+ return CreateNativeInstance(); |
msw
2014/11/12 18:55:21
Allow HarfBuzz with switches::kEnableHarfBuzzRende
ckocagil
2014/11/12 19:23:01
Done.
|
+#else |
return CommandLine::ForCurrentProcess()->HasSwitch( |
msw
2014/11/12 18:55:21
optional nit: cache the command line value in a st
ckocagil
2014/11/12 19:23:01
Done.
|
switches::kDisableHarfBuzzRenderText) ? CreateNativeInstance() : |
new RenderTextHarfBuzz; |
+#endif |
} |
void RenderText::SetText(const base::string16& text) { |