Cache gfx::RenderText instances in views::Label.

ui/gfx/render_text.cc

Index: ui/gfx/render_text.cc
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index c4f841dfcf7898f4b590f31839f865e8afbdac74..2cd1d3f2c03984cff453b9f07f93c50d5f1237a3 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -402,6 +402,7 @@ void ApplyRenderParams(const FontRenderParams& params,
 RenderText::~RenderText() {
 }
 
+// static
 RenderText* RenderText::CreateInstance() {
 #if defined(OS_MACOSX)
   static const bool use_native =
@@ -413,6 +414,7 @@ RenderText* RenderText::CreateInstance() {
   return new RenderTextHarfBuzz;
 }
 
+// static
 RenderText* RenderText::CreateInstanceForEditing() {
   return new RenderTextHarfBuzz;
 }
@@ -1093,7 +1095,7 @@ HorizontalAlignment RenderText::GetCurrentHorizontalAlignment() {
 
 Vector2d RenderText::GetAlignmentOffset(size_t line_number) {
   // TODO(ckocagil): Enable |lines_| usage on RenderTextMac.
-  if (multiline_)
+  if (MultilineSupported() && multiline_)
     DCHECK_LT(line_number, lines_.size());
   Vector2d offset;
   HorizontalAlignment horizontal_alignment = GetCurrentHorizontalAlignment();