Correct text y position calculation in RenderTextWin.

Correct text y position calculation in RenderTextWin.

The previous calculation had a problem due to the following logic:

  SkPoint point(SkPoint::Make(SkIntToScalar(offset.x()),
      SkIntToScalar(display_rect().height() - offset.y())));

If display_rect().y() was large and height was the height for e.g. one line of text, then when the code subtracted offset.y() (which was based on display_rect().y()), the result was a negative y position (offscreen) for the text.

This CL changes the logic to correctly center the text vertically regardless of the y position, which I believe was the intention of the code.

BUG=none
TEST=Open Chrome with --use-pure-views. Type something into omnibox. Text should be centered in omnibox.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107625

[msw, 2011-10-27 18:09:29]

LGTM with nits.

http://codereview.chromium.org/8401032/diff/1/ui/gfx/render_text_win.cc
File ui/gfx/render_text_win.cc (right):

http://codereview.chromium.org/8401032/diff/1/ui/gfx/render_text_win.cc#newco...
ui/gfx/render_text_win.cc:596: base_y += (display_rect().height() - 
default_style().font.GetHeight()) / 2;
You have an extra space after the minus symbol '-'.
Also, default_style().font.GetHeight() is assigned to |height| at line 591;
please use that local or scrap it.

[commit-bot: I haz the power, 2011-10-27 18:12:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/asvitkine@chromium.org/8401032/3002

[Alexei Svitkine (slow), 2011-10-27 18:12:23]

>
http://codereview.chromium.org/8401032/diff/1/ui/gfx/render_text_win.cc#newco...
> ui/gfx/render_text_win.cc:596: base_y += (display_rect().height() -
> default_style().font.GetHeight()) / 2;
> You have an extra space after the minus symbol '-'.
> Also, default_style().font.GetHeight() is assigned to |height| at line
> 591; please use that local or scrap it.

Woops, thanks!

-Alexei

[commit-bot: I haz the power, 2011-10-27 21:21:12]

Change committed as 107625