Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: ui/gfx/render_text.cc

Issue 326093004: MacViews: Enable RenderTextHarfBuzz to get Textfields to work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698