Change RenderText::GetOriginForDrawing() to GetOffsetForDrawing and return a Vector2d.

This method should return a Vector instead of a Point.

Covered by existing tests; no change in behaviour.

R=sky,pkasting

Review URL: https://codereview.chromium.org/11367012

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

1 files changed, 8 insertions, 7 deletions

diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 7b23dbe..98d40f3 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1130,17 +1130,18 @@ TEST_F(RenderTextTest, OriginForDrawing) {
   Rect display_rect(0, 0, 100, font_height);
   render_text->SetDisplayRect(display_rect);
 
-  Point origin = render_text->GetOriginForDrawing();
-  EXPECT_EQ(origin.x(), 0);
-  EXPECT_EQ(origin.y(), 0);
+  Vector2d offset = render_text->GetOffsetForDrawing();
+  EXPECT_TRUE(offset.IsZero());
 
   // Set display area's height greater than font height.
-  display_rect = Rect(0, 0, 100, font_height + 2);
+  const int kEnlargement = 2;
+  display_rect = Rect(0, 0, 100, font_height + kEnlargement);
   render_text->SetDisplayRect(display_rect);
 
-  origin = render_text->GetOriginForDrawing();
-  EXPECT_EQ(origin.x(), 0);
-  EXPECT_EQ(origin.y(), 1);
+  // Text should be vertically centered.
+  offset = render_text->GetOffsetForDrawing();
+  EXPECT_EQ(offset.x(), 0);
+  EXPECT_EQ(offset.y(), kEnlargement / 2);
 }
 
 TEST_F(RenderTextTest, SameFontForParentheses) {