Shows Japanese and English mixed queries correctly.

ui/gfx/render_text.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.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 838 matching lines @@
   return point + GetTextOffset();
 }
 
 Vector2d RenderText::GetAlignmentOffset() {
   Vector2d offset;
   if (horizontal_alignment_ != ALIGN_LEFT) {
     offset.set_x(display_rect().width() - GetContentWidth());
     if (horizontal_alignment_ == ALIGN_CENTER)
       offset.set_x(offset.x() / 2);
   }
+  const Size& string_size = GetStringSize();
   if (vertical_alignment_ != ALIGN_TOP) {
-    offset.set_y(display_rect().height() - GetStringSize().height());
+    offset.set_y(display_rect().height() - string_size.height());

[Peter Kasting, 2013/07/09 17:28:36]

I think we should be subtracting the font height here, since your new code
suggests that if the two differ, the font height should be larger?  This may
mean we need to use the font height instead of the string size in some other
places, e.g. GetCursorBounds()?  Or perhaps using GetFont() isn't right here and
we need to get a particular font for a run?

You should rope in msw/asvitkine and ask them about all this.

[Yuki, 2013/07/11 13:25:40]

Done.

     if (vertical_alignment_ == ALIGN_VCENTER)
       offset.set_y(offset.y() / 2);
   }
+  // Vertically centerize text smaller than the font size.
+  // Character height, returned by |pango_layout_get_pixel_size()|, varies
+  // depending on character sets even when the font size is the same.
+  //
+  // Latin characters (e.g. q and y) have extra space below the baseline and
+  // another extra space above the characters so it matches the space below
+  // the baseline.
+  // With the same font size, some non-Latin characters (e.g. Japanese) don't
+  // have such extra space below the baseline or above the characters.  In that
+  // case, those characters' height could be smaller than the font size.
+  // We'll add padding space in such case.
+  const int font_height = GetFont().GetHeight();
+  const int string_height = string_size.height();
+  if (string_height < font_height) {
+    offset.set_y(offset.y() + (font_height - string_height) / 2);
+  }
   return offset;
 }
 
 void RenderText::ApplyFadeEffects(internal::SkiaTextRenderer* renderer) {
   if (!fade_head() && !fade_tail())
     return;
 
   const int text_width = GetStringSize().width();
   const int display_width = display_rect().width();
 
@@ skipping 142 matching lines @@
   cursor_bounds_ += delta_offset;
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx