Make bigger string size in RenderTextHarfBuzz.

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index e7829f65d6b86089256f61d473a1303e14908990..03c84f5668b2aca2b5e1dd3c7e73eeb2015eea95 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1374,7 +1374,9 @@ TEST_F(RenderTextTest, StringSizeEmptyString) {
   EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
 
   render_text->SetText(UTF8ToUTF16(" "));
-  EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height());
+  // If it's not empty, render_text's height could be slightly bigger than

[msw, 2015/02/24 23:31:36]

nit: |render_text|'s. Also, what does this mean by "If it's not empty"? Could
|render_text|'s height here be zero? Why would that be the case?

[Jun Mukai, 2015/02/25 23:49:19]

Fixed. I meant the text isn't empty (in this case the text is single character
whitespace " ")

+  // the font height for the distance from the top bearing line to the ascender.

[msw, 2015/02/24 23:31:35]

nit: try to keep the wording of these comments as consistent as possible.

[Jun Mukai, 2015/02/25 23:49:19]

Done (I think...)

+  EXPECT_LE(font_list.GetHeight(), render_text->GetStringSize().height());
   EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
 }
 #endif  // !defined(OS_MACOSX)
@@ -1414,7 +1416,10 @@ TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) {
   render_text->SetFontList(FontList(smaller_font));
   render_text->SetDisplayRect(Rect(0, 0, 0,
                                    render_text->font_list().GetHeight()));
-  EXPECT_EQ(smaller_font.GetHeight(), render_text->GetStringSize().height());
+  // render text height may not be exactly same to smaller_font's height

[msw, 2015/02/24 23:31:36]

nits: "|render_text|'s height", "exactly the same as", "|smaller_font|'s".

[Jun Mukai, 2015/02/25 23:49:19]

Done.

+  // considering the gap between the top bearing line and the ascender.
+  // See http://crbug.com/459812
+  EXPECT_LE(smaller_font.GetHeight(), render_text->GetStringSize().height());
   EXPECT_EQ(smaller_font.GetBaseline(), render_text->GetBaseline());
 
   // Layout the same text with mixed fonts.  The text should be rendered with
@@ -1429,7 +1434,8 @@ TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) {
                                    render_text->font_list().GetHeight()));
   EXPECT_LT(smaller_font.GetHeight(), render_text->GetStringSize().height());
   EXPECT_LT(smaller_font.GetBaseline(), render_text->GetBaseline());
-  EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height());
+  // Again, it could be slightly different from font's height, see above.
+  EXPECT_LE(font_list.GetHeight(), render_text->GetStringSize().height());
   EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
 }
 
@@ -1446,7 +1452,7 @@ TEST_F(RenderTextTest, MinLineHeight) {
 
   render_text->SetMinLineHeight(default_size.height() * 2);
   SizeF taller_size = render_text->GetStringSizeF();
-  EXPECT_EQ(default_size.height() * 2, taller_size.height());
+  EXPECT_LT(default_size.height(), taller_size.height());
   EXPECT_EQ(default_size.width(), taller_size.width());
 }