Correct text y position calculation in RenderTextWin.

ui/gfx/render_text_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text_win.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 571 matching lines @@
 
 void RenderTextWin::DrawVisualText(Canvas* canvas) {
   if (text().empty())
     return;
 
   SkCanvas* canvas_skia = canvas->GetSkCanvas();
 
   Point offset(ToViewPoint(Point()));
   // TODO(msw): Establish a vertical baseline for strings of mixed font heights.
   size_t height = default_style().font.GetHeight();
+
+  float base_x = SkIntToScalar(offset.x());
+  float base_y = SkIntToScalar(offset.y());
   // Center the text vertically in the display area.
-  offset.Offset(0, (display_rect().height() - height) / 2);
+  base_y += (display_rect().height() - height) / 2;
+  // Offset by the font size to account for Skia expecting y to be the bottom.
+  base_y += default_style().font.GetFontSize();
 
   SkPaint paint;
   paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
   paint.setSubpixelText(true);
   paint.setLCDRenderText(true);
-  SkPoint point(SkPoint::Make(SkIntToScalar(offset.x()),
-      SkIntToScalar(display_rect().height() - offset.y())));
+
   scoped_array<SkPoint> pos;
   for (size_t i = 0; i < runs_.size(); ++i) {
     // Get the run specified by the visual-to-logical map.
     internal::TextRun* run = runs_[visual_to_logical_[i]];
 
     // TODO(msw): Font default/fallback and style integration.
     std::string font(UTF16ToASCII(run->font.GetFontName()));
     SkTypeface::Style style = SkTypeface::kNormal;
     SkTypeface* typeface = SkTypeface::CreateFromName(font.c_str(), style);
     if (typeface) {
       paint.setTypeface(typeface);
       // |paint| adds its own ref. Release the ref from CreateFromName.
       typeface->unref();
     }
     paint.setTextSize(run->font.GetFontSize());
     paint.setColor(run->foreground);
 
     // Based on WebCore::skiaDrawText.
     pos.reset(new SkPoint[run->glyph_count]);
     for (int glyph = 0; glyph < run->glyph_count; glyph++) {
-        pos[glyph].set(point.x() + run->offsets[glyph].du,
-                       point.y() + run->offsets[glyph].dv);
-        point.offset(SkIntToScalar(run->advance_widths[glyph]), 0);
+        pos[glyph].set(base_x + run->offsets[glyph].du,
+                       base_y + run->offsets[glyph].dv);
+        base_x += SkIntToScalar(run->advance_widths[glyph]);
     }
     size_t byte_length = run->glyph_count * sizeof(WORD);
     canvas_skia->drawPosText(run->glyphs.get(), byte_length, pos.get(), paint);
 
     // Draw the strikethrough.
     if (run->strike) {
       Rect bounds(offset, Size(run->width, run->font.GetHeight()));
       SkPaint strike;
       strike.setAntiAlias(true);
       strike.setStyle(SkPaint::kFill_Style);
@@ skipping 16 matching lines @@
     Rect r(GetUpdatedCursorBounds());
     canvas->DrawRectInt(kCursorColor, r.x(), r.y(), r.width(), r.height());
   }
 }
 
 RenderText* RenderText::CreateRenderText() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx