Shows Japanese and English mixed queries correctly.

ui/gfx/render_text.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
 #include <algorithm>
 #include <cstring>
 #include <string>
@@ skipping 129 matching lines @@
   const FontList& font_list() const { return font_list_; }
   void SetFontList(const FontList& font_list);
   void SetFont(const Font& font);
 
   // Set the font size to |size| in pixels.
   void SetFontSize(int size);
 
   // Get the first font in |font_list_|.
   const Font& GetFont() const;
 
+  // Returns the common height and baseline of the fonts in the font list.
+  int GetFontListHeight() const { return font_list_height_; }
+  int GetFontListBaseline() const { return font_list_baseline_; }
+
   bool cursor_enabled() const { return cursor_enabled_; }
   void SetCursorEnabled(bool cursor_enabled);
 
   bool cursor_visible() const { return cursor_visible_; }
   void set_cursor_visible(bool visible) { cursor_visible_ = visible; }
 
   bool insert_mode() const { return insert_mode_; }
   void ToggleInsertMode();
 
   SkColor cursor_color() const { return cursor_color_; }
@@ skipping 327 matching lines @@
 
   // The text directionality mode, defaults to DIRECTIONALITY_FROM_TEXT.
   DirectionalityMode directionality_mode_;
 
   // The cached text direction, potentially computed from the text or UI locale.
   // Use GetTextDirection(), do not use this potentially invalid value directly!
   base::i18n::TextDirection text_direction_;
 
   // A list of fonts used to render |text_|.
   FontList font_list_;
+  // The common height and baseline of the fonts in the font list.
+  // We cache these values because they change iff |font_list_| changes, and
+  // we need to scan font metrics for all the fonts in |font_list_| in order to
+  // get these values.
+  int font_list_height_;

[msw, 2013/07/11 22:47:29]

Can FontList cache these values itself?

[Yuki, 2013/07/12 08:25:53]

Yes, I've moved these cache to FontList.

+  int font_list_baseline_;
 
   // Logical selection range and visual cursor position.
   SelectionModel selection_model_;
 
   // The cached cursor bounds; get these bounds with GetUpdatedCursorBounds.
   Rect cursor_bounds_;
 
   // Specifies whether the cursor is enabled. If disabled, no space is reserved
   // for the cursor when positioning text.
   bool cursor_enabled_;
@@ skipping 65 matching lines @@
 
   // Text shadows to be drawn.
   ShadowValues text_shadows_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_