Always aligns text at vertically center (Textfield, Label).

ui/gfx/render_text_linux.cc

 // Copyright (c) 2012 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_linux.h"
 
 #include <pango/pangocairo.h>
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 73 matching lines @@
   int width = 0, height = 0;
   pango_layout_get_pixel_size(layout_, &width, &height);
   // Keep a consistent height between this particular string's PangoLayout and
   // potentially larger text supported by the FontList.
   // For example, if a text field contains a Japanese character, which is
   // smaller than Latin ones, and then later a Latin one is inserted, this
   // ensures that the text baseline does not shift.
   return Size(width, std::max(height, font_list().GetHeight()));
 }
 
-int RenderTextLinux::GetBaseline() {
-  EnsureLayout();
-  // Keep a consistent baseline between this particular string's PangoLayout and
-  // potentially larger text supported by the FontList.
-  // See the example in GetStringSize().
-  return std::max(PANGO_PIXELS(pango_layout_get_baseline(layout_)),
-                  font_list().GetBaseline());
-}
-
 SelectionModel RenderTextLinux::FindCursorPosition(const Point& point) {
   EnsureLayout();
 
   if (text().empty())
     return SelectionModel(0, CURSOR_FORWARD);
 
   Point p(ToTextPoint(point));
 
   // When the point is outside of text, return HOME/END position.
   if (p.x() < 0)
@@ skipping 26 matching lines @@
     const int end = LayoutIndexToTextIndex(item->offset + item->length);
     const Range range(start, end);
 
     ScopedPangoFontDescription desc(pango_font_describe(item->analysis.font));
     spans.push_back(RenderText::FontSpan(Font(desc.get()), range));
   }
 
   return spans;
 }
 
+int RenderTextLinux::GetLayoutTextBaseline() {
+  EnsureLayout();
+  return PANGO_PIXELS(pango_layout_get_baseline(layout_));
+}
+
 SelectionModel RenderTextLinux::AdjacentCharSelectionModel(
     const SelectionModel& selection,
     VisualCursorDirection direction) {
   GSList* run = GetRunContainingCaret(selection);
   if (!run) {
     // The cursor is not in any run: we're at the visual and logical edge.
     SelectionModel edge = EdgeSelectionModel(direction);
     if (edge.caret_pos() == selection.caret_pos())
       return edge;
     else
@@ skipping 215 matching lines @@
   DCHECK(italic == styles()[ITALIC].breaks().end());
 
   pango_layout_set_attributes(layout, attrs);
   pango_attr_list_unref(attrs);
 }
 
 void RenderTextLinux::DrawVisualText(Canvas* canvas) {
   DCHECK(layout_);
 
   // Skia will draw glyphs with respect to the baseline.
-  Vector2d offset(GetLineOffset(0) + Vector2d(0, GetBaseline()));
+  Vector2d offset(GetLineOffset(0) + Vector2d(0, GetLayoutTextBaseline()));
 
   SkScalar x = SkIntToScalar(offset.x());
   SkScalar y = SkIntToScalar(offset.y());
 
   std::vector<SkPoint> pos;
   std::vector<uint16> glyphs;
 
   internal::SkiaTextRenderer renderer(canvas);
   ApplyFadeEffects(&renderer);
   ApplyTextShadows(&renderer);
@@ skipping 114 matching lines @@
                                           int glyph_index) const {
   return LayoutIndexToTextIndex(run->item->offset +
                                 run->glyphs->log_clusters[glyph_index]);
 }
 
 RenderText* RenderText::CreateInstance() {
   return new RenderTextLinux;
 }
 
 }  // namespace gfx