Shows Japanese and English mixed queries correctly.

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 65 matching lines @@
 }
 
 RenderTextLinux::~RenderTextLinux() {
   ResetLayout();
 }
 
 Size RenderTextLinux::GetStringSize() {
   EnsureLayout();
   int width = 0, height = 0;
   pango_layout_get_pixel_size(layout_, &width, &height);
-  return Size(width, height);
+  // pango_layout_get_pixel_size() returns the minimal size to render the given

[msw, 2013/07/12 09:36:04]

nit: these could be more concise; like "Keep a consistent [height|baseline]
between this particular string's PangoLayout and potentially larger text
supported by the FontList."

[Yuki, 2013/07/12 10:29:24]

Thanks.

+  // text, and the height can be smaller than the font height.  This means the
+  // baseline may change as the content text changes.  Since we'd like to keep
+  // the same baseline as much as possible, we respect the height determined by
+  // the font list, unless the actual height is higher than the height of the
+  // font list.
+  return Size(width, std::max(height, font_list().GetHeight()));
 }
 
 int RenderTextLinux::GetBaseline() {
   EnsureLayout();
-  return PANGO_PIXELS(pango_layout_get_baseline(layout_));
+  // pango_layout_get_baseline() returns the baseline based on the minimal size
+  // to render the given text, and the baseline can be smaller than the font
+  // baseline.  This means the baseline may change as the content text changes.
+  // Since we'd like to keep the same baseline as much as possible, we respect
+  // the baseline determined by the font list, unless the actual baseline is
+  // greater than the baseline of the font list.
+  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));
 
@@ skipping 255 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(GetTextOffset() +
-      Vector2d(0, PANGO_PIXELS(pango_layout_get_baseline(layout_))));
+  Vector2d offset(GetTextOffset() + Vector2d(0, GetBaseline()));
 
   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 113 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