Supports FontList in Textfield.

ui/views/controls/textfield/textfield.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/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 252 matching lines @@
 
 bool Textfield::GetCursorEnabled() const {
   return native_wrapper_ && native_wrapper_->GetCursorEnabled();
 }
 
 void Textfield::SetCursorEnabled(bool enabled) {
   if (native_wrapper_)
     native_wrapper_->SetCursorEnabled(enabled);
 }
 
-void Textfield::SetFont(const gfx::Font& font) {
-  font_ = font;
+void Textfield::SetFontList(const gfx::FontList& font_list) {
+  font_list_ = font_list;
   if (native_wrapper_)
     native_wrapper_->UpdateFont();
   PreferredSizeChanged();
 }
 
+const gfx::Font& Textfield::GetPrimaryFont() const {
+  return font_list_.GetPrimaryFont();
+}
+
+void Textfield::SetFont(const gfx::Font& font) {
+  SetFontList(gfx::FontList(font));
+}
+
 void Textfield::SetHorizontalMargins(int left, int right) {
   margins_.Set(margins_.top(), left, margins_.bottom(), right);
   horizontal_margins_were_set_ = true;
   if (native_wrapper_)
     native_wrapper_->UpdateHorizontalMargins();
   PreferredSizeChanged();
 }
 
 void Textfield::SetVerticalMargins(int top, int bottom) {
   margins_.Set(top, margins_.left(), bottom, margins_.right());
@@ skipping 127 matching lines @@
 void Textfield::Layout() {
   if (native_wrapper_) {
     native_wrapper_->GetView()->SetBoundsRect(GetContentsBounds());
     native_wrapper_->GetView()->Layout();
   }
 }
 
 int Textfield::GetBaseline() const {
   gfx::Insets insets = GetTextInsets();
   const int baseline = native_wrapper_ ?
-      native_wrapper_->GetTextfieldBaseline() : font_.GetBaseline();
+      native_wrapper_->GetTextfieldBaseline() : font_list_.GetBaseline();
   return insets.top() + baseline;
 }
 
 gfx::Size Textfield::GetPreferredSize() {
   gfx::Insets insets = GetTextInsets();
 
   // For NativeTextfieldViews, we might use a pre-defined font list (defined in

[msw, 2013/07/23 19:51:54]

Does this comment need updating?

[Yuki, 2013/07/24 09:17:05]

I simply deleted the comment.  We no longer need it.

   // IDS_UI_FONT_FAMILY_CROS) as the fonts to render text. The fonts in the
   // list might be different (in name or in size) from |font_|, so we need to
   // use GetFontHeight() to get the height of the first font in the list to
   // guide textfield's height.
   const int font_height = native_wrapper_ ? native_wrapper_->GetFontHeight() :
-                                            font_.GetHeight();
-  return gfx::Size(font_.GetExpectedTextWidth(default_width_in_chars_) +
-                       insets.width(), font_height + insets.height());
+                                            font_list_.GetHeight();
+  return gfx::Size(
+      GetPrimaryFont().GetExpectedTextWidth(default_width_in_chars_)
+      + insets.width(),
+      font_height + insets.height());
 }
 
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll(false);
 }
 
 bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) {
   // Skip any accelerator handling of backspace; textfields handle this key.
   // Also skip processing of [Alt]+<num-pad digit> Unicode alt key codes.
   return e.key_code() == ui::VKEY_BACK || e.IsUnicodeKeyCode();
@@ skipping 103 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!Textfield::IsViewsTextfieldEnabled())
     return new NativeTextfieldWin(field);
 #endif
   return new NativeTextfieldViews(field);
 }
 
 }  // namespace views