Add textfield internal padding from FocusableBorder.

ui/views/controls/textfield/textfield.cc

Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index bedee3a1c0c8cabcece0a1f5d192c79e9f5d5191..d6af7d53a434638b14303a84a2b4b777cb8727e6 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -238,6 +238,7 @@ int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
 
 // static
 const char Textfield::kViewClassName[] = "Textfield";
+const int Textfield::kTextPadding = 3;
 
 // static
 size_t Textfield::GetCaretBlinkMs() {
@@ -555,7 +556,8 @@ int Textfield::GetBaseline() const {
 }
 
 gfx::Size Textfield::GetPreferredSize() const {
-  const gfx::Insets& insets = GetInsets();
+  gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(kTextPadding, kTextPadding, kTextPadding, kTextPadding);

[calamity, 2014/09/08 03:37:50]

Is there any reason that horizontal padding needs to be added here? This will
change the x position of text for textfields that have custom borders (such as
the ones in the app list).

Can you have FocusableBorder do the side borders while this does the top and
bottom padding?

If you do this, the app list will be visually unchanged and you can remove all
the changes from folder_header_view and search_box_view.

[Peter Kasting, 2014/09/08 17:45:59]

I vetoed this route, because the side padding isn't actually a property of
focusable borders, it's a property of textfields.  This change basically says
that we always want padding around the textfield contents, and any callers that
don't apply that padding are actually wrong as-is, so their behavior needs to
change.

In other words, it's intentional that this change might not preserve existing
behavior.

[calamity, 2014/09/09 00:46:38]

Ack.

   return gfx::Size(GetFontList().GetExpectedTextWidth(default_width_in_chars_) +
                    insets.width(), GetFontList().GetHeight() + insets.height());
 }
@@ -919,7 +921,14 @@ void Textfield::GetAccessibleState(ui::AXViewState* state) {
 }
 
 void Textfield::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  GetRenderText()->SetDisplayRect(GetContentsBounds());
+  // Textfield preferred sizing includes a reasonable amount of whitespace on
+  // all sides of the default font list. Fallback fonts with larger heights may
+  // paint over the vertical whitespace as needed. Alternate solutions involve
+  // undesirable behavior like changing the default font size, shrinking some
+  // fallback fonts beyond their legibility, or enlarging controls dynamically.
+  gfx::Rect bounds = GetContentsBounds();
+  bounds.Inset(kTextPadding, 0);
+  GetRenderText()->SetDisplayRect(bounds);
   OnCaretBoundsChanged();
 }