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"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/range/range.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/views_delegate.h"
@@ skipping 45 matching lines @@
   if (!loaded_msftedit_dll)
     return true;
 #endif
   return true;
 }
 
 Textfield::Textfield()
     : native_wrapper_(NULL),
       controller_(NULL),
       style_(STYLE_DEFAULT),
+      font_list_(GetDefaultFontList()),
       read_only_(false),
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       vertical_alignment_(gfx::ALIGN_VCENTER),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
       text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
   set_focusable(true);
 
   if (ViewsDelegate::views_delegate) {
     obscured_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
 }
 
 Textfield::Textfield(StyleFlags style)
     : native_wrapper_(NULL),
       controller_(NULL),
       style_(style),
+      font_list_(GetDefaultFontList()),
       read_only_(false),
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       vertical_alignment_(gfx::ALIGN_VCENTER),
@@ skipping 147 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
-  // 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 82 matching lines @@
     if (!IsViewsTextfieldEnabled())
       static_cast<NativeTextfieldWin*>(native_wrapper_)->AttachHack();
 #endif
   }
 }
 
 const char* Textfield::GetClassName() const {
   return kViewClassName;
 }
 
+// static
+gfx::FontList Textfield::GetDefaultFontList() {

[msw, 2013/07/30 21:32:27]

This is only used by the Textfield ctors above. Instead of making this a private
static class function, make it a file-local static function in the anonymous
namespace up top.

[Yuki, 2013/07/31 05:38:43]

Done.

+  return ResourceBundle::GetSharedInstance().GetFontList(
+      ResourceBundle::BaseFont);
+}
+
 gfx::Insets Textfield::GetTextInsets() const {
   gfx::Insets insets = GetInsets();
   if (draw_border_ && native_wrapper_)
     insets += native_wrapper_->CalculateInsets();
   return insets;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 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