Revert 130447 - Use a common font baseline in RenderText classes.

This ensures the text in different runs gets aligned
along a common bottom baseline and that the correct
font's baseline gets used in case of font fallback.

Also, uses the correct height when centering text.

BUG=105550
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9968040

TBR=asvitkine@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9965140

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130562 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 5769fe1..88ca60f 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -993,27 +993,27 @@ TEST_F(RenderTextTest, CursorBoundsInReplacementMode) {
   EXPECT_EQ(cursor_around_b.right(), cursor_before_c.x());
 }
 
-TEST_F(RenderTextTest, OriginForDrawing) {
+TEST_F(RenderTextTest, OriginForSkiaDrawing) {
   scoped_ptr<RenderText> render_text(RenderText::CreateRenderText());
   render_text->SetText(ASCIIToUTF16("abcdefg"));
   render_text->SetFontList(FontList("Arial, 13px"));
 
   // Set display area's height equals to font height.
-  const int font_height = render_text->GetStringSize().height();
+  int font_height = render_text->GetFont().GetHeight();
   Rect display_rect(0, 0, 100, font_height);
   render_text->SetDisplayRect(display_rect);
 
-  Point origin = render_text->GetOriginForDrawing();
+  Point origin = render_text->GetOriginForSkiaDrawing();
   EXPECT_EQ(origin.x(), 0);
-  EXPECT_EQ(origin.y(), 0);
+  EXPECT_EQ(origin.y(), render_text->GetFont().GetBaseline());
 
   // Set display area's height greater than font height.
   display_rect = Rect(0, 0, 100, font_height + 2);
   render_text->SetDisplayRect(display_rect);
 
-  origin = render_text->GetOriginForDrawing();
+  origin = render_text->GetOriginForSkiaDrawing();
   EXPECT_EQ(origin.x(), 0);
-  EXPECT_EQ(origin.y(), 1);
+  EXPECT_EQ(origin.y(), render_text->GetFont().GetBaseline() + 1);
 }
 
 TEST_F(RenderTextTest, DisplayRectShowsCursorLTR) {