Supports FontList in Textfield.

ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2013 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/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/app_locale_settings.h"

[msw, 2013/07/26 21:19:57]

Can this be removed if IDS_UI_FONT_FAMILY_CROS isn't used here?

[Yuki, 2013/07/29 15:27:21]

Done.

 #include "grit/ui_strings.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/range/range.h"
 #include "ui/base/ui_base_switches_util.h"
@@ skipping 48 matching lines @@
     : textfield_(parent),
       model_(new TextfieldViewsModel(this)),
       text_border_(new FocusableBorder()),
       is_cursor_visible_(false),
       is_drop_cursor_visible_(false),
       skip_input_method_cancel_composition_(false),
       initiating_drag_(false),
       cursor_timer_(this),
       aggregated_clicks_(0) {
   set_border(text_border_);
-
-#if defined(OS_CHROMEOS)
-  GetRenderText()->SetFontList(gfx::FontList(l10n_util::GetStringUTF8(

[msw, 2013/07/26 21:19:57]

I think you'll need to leave this explicit IDS_UI_FONT_FAMILY_CROS usage as the
NativeTextfieldViews default, or initialize Views::Textfield::font_list_ with
the same value. Otherwise, it seems like CrOS textfield instances (besides the
omnibox) will regress by being initialized with the Views::Textfield::font_list_
value, which is currently a single resource bundle default font, afaict.

[Yuki, 2013/07/29 15:27:21]

Done.  As the same as views::Label, I've introduced a private static method
views::Textfield::GetDefaultFontList() and the ctors now call it.  Also see the
new method ResourceBundle::GetFontList().

-      IDS_UI_FONT_FAMILY_CROS)));
-#else
-  GetRenderText()->SetFont(textfield_->font());
-#endif
-
+  GetRenderText()->SetFontList(textfield_->font_list());
   UpdateColorsFromTheme(GetNativeTheme());
   set_context_menu_controller(this);
   set_drag_controller(this);
 }
 
 NativeTextfieldViews::~NativeTextfieldViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, View overrides:
@@ skipping 465 matching lines @@
   set_background(Background::CreateSolidBackground(color));
   GetRenderText()->set_background_is_transparent(SkColorGetA(color) != 0xFF);
   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateReadOnly() {
   OnTextInputTypeChanged();
 }
 
 void NativeTextfieldViews::UpdateFont() {
-#if defined(OS_CHROMEOS)
-  // For ChromeOS, we support a pre-defined font list per locale. UpdateFont()
-  // only changes the font size, not the font family names.
-  GetRenderText()->SetFontSize(textfield_->font().GetFontSize());
-#else
-  GetRenderText()->SetFont(textfield_->font());
-#endif
+  GetRenderText()->SetFontList(textfield_->font_list());
   OnCaretBoundsChanged();
 }
 
 void NativeTextfieldViews::UpdateIsObscured() {
   GetRenderText()->SetObscured(textfield_->IsObscured());
   OnCaretBoundsChanged();
   SchedulePaint();
   OnTextInputTypeChanged();
 }
 
@@ skipping 124 matching lines @@
 
 ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
   return textfield_->read_only() ? NULL : this;
 }
 
 void NativeTextfieldViews::ClearEditHistory() {
   model_->ClearEditHistory();
 }
 
 int NativeTextfieldViews::GetFontHeight() {
-  return GetRenderText()->GetFont().GetHeight();
+  return GetRenderText()->font_list().GetHeight();
 }
 
 int NativeTextfieldViews::GetTextfieldBaseline() const {
-  return GetRenderText()->GetFont().GetBaseline();
+  return GetRenderText()->font_list().GetBaseline();
 }
 
 int NativeTextfieldViews::GetWidthNeededForText() const {
   return GetRenderText()->GetContentWidth() + GetInsets().width();
 }
 
 void NativeTextfieldViews::ExecuteTextCommand(int command_id) {
   ExecuteCommand(command_id, 0);
 }
 
@@ skipping 415 matching lines @@
 
   // Draw the detached drop cursor that marks where the text will be dropped.
   if (is_drop_cursor_visible_)
     GetRenderText()->DrawCursor(canvas, drop_cursor_position_);
 
   // Draw placeholder text if needed.
   if (model_->GetText().empty() &&
       !textfield_->placeholder_text().empty()) {
     canvas->DrawStringInt(
         textfield_->placeholder_text(),
-        GetRenderText()->GetFont(),
+        GetRenderText()->GetPrimaryFont(),
         textfield_->placeholder_text_color(),
         GetRenderText()->display_rect());
   }
   canvas->Restore();
 }
 
 bool NativeTextfieldViews::HandleKeyEvent(const ui::KeyEvent& key_event) {
   // TODO(oshima): Refactor and consolidate with ExecuteCommand.
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = key_event.key_code();
@@ skipping 328 matching lines @@
   if (index != -1) {
     obscured_reveal_timer_.Start(
         FROM_HERE,
         duration,
         base::Bind(&NativeTextfieldViews::RevealObscuredChar,
                    base::Unretained(this), -1, base::TimeDelta()));
   }
 }
 
 }  // namespace views