For multiline text use the maximum of the string height and the line height while calculating the h…

ui/gfx/canvas_skia.cc

Index: ui/gfx/canvas_skia.cc
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index dc35eeda4f56b1b054f63dd2ccb162d19706d94d..a0d3705ca4ca6ff2d9397c8b0162a2090bfcd3ad 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -191,7 +191,9 @@ void Canvas::SizeStringFloat(const base::string16& text,
       render_text->SetText(strings[i]);
       const SizeF& string_size = render_text->GetStringSizeF();
       w = std::max(w, string_size.width());
-      h += (i > 0 && line_height > 0) ? line_height : string_size.height();
+      h += (i > 0 && line_height > 0) ?
+               std::max(static_cast<float>(line_height), string_size.height())
+                   : string_size.height();
     }
     *width = w;
     *height = h;