Add textfield internal padding from FocusableBorder.

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/debug/trace_event.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 220 matching lines @@
       return kNoCommand;
   }
   return kNoCommand;
 }
 #endif
 
 }  // namespace
 
 // static
 const char Textfield::kViewClassName[] = "Textfield";
+const int Textfield::kTextPadding = 3;
 
 // static
 size_t Textfield::GetCaretBlinkMs() {
   static const size_t default_value = 500;
 #if defined(OS_WIN)
   static const size_t system_value = ::GetCaretBlinkTime();
   if (system_value != 0)
     return (system_value == INFINITE) ? 0 : system_value;
 #endif
   return default_value;
@@ skipping 292 matching lines @@
   focus_painter_ = focus_painter.Pass();
 }
 
 bool Textfield::HasTextBeingDragged() {
   return initiating_drag_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, View overrides:
 
+gfx::Insets Textfield::GetInsets() const {
+  gfx::Insets insets = View::GetInsets();
+  insets += gfx::Insets(kTextPadding, kTextPadding, kTextPadding, kTextPadding);
+  return insets;
+}
+
 int Textfield::GetBaseline() const {
   return GetInsets().top() + GetRenderText()->GetBaseline();
 }
 
 gfx::Size Textfield::GetPreferredSize() const {
-  const gfx::Insets& insets = GetInsets();
+  const gfx::Insets insets = GetInsets();

[msw, 2014/09/09 17:01:05]

MSW: NEED TO RESTORE CONST REF.

   return gfx::Size(GetFontList().GetExpectedTextWidth(default_width_in_chars_) +
                    insets.width(), GetFontList().GetHeight() + insets.height());
 }
 
 const char* Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::NativeCursor Textfield::GetCursor(const ui::MouseEvent& event) {
   bool in_selection = GetRenderText()->IsPointInSelection(event.location());
@@ skipping 343 matching lines @@
   state->selection_end = range.end();
 
   if (!read_only()) {
     state->set_value_callback =
         base::Bind(&Textfield::AccessibilitySetValue,
                    weak_ptr_factory_.GetWeakPtr());
   }
 }
 
 void Textfield::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  GetRenderText()->SetDisplayRect(GetContentsBounds());
+  // Textfield insets include 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 with content.
+  gfx::Rect bounds = GetContentsBounds();
+  // GetContentsBounds() does not actually use the local GetInsets() override.
+  bounds.Inset(gfx::Insets(0, kTextPadding, 0, kTextPadding));
+  GetRenderText()->SetDisplayRect(bounds);
   OnCaretBoundsChanged();
 }
 
 void Textfield::OnEnabledChanged() {
   View::OnEnabledChanged();
   if (GetInputMethod())
     GetInputMethod()->OnTextInputTypeChanged(this);
   SchedulePaint();
 }
 
@@ skipping 859 matching lines @@
       const size_t length = selection_clipboard_text.length();
       range = gfx::Range(range.start() + length, range.end() + length);
     }
     model_->MoveCursorTo(gfx::SelectionModel(range, affinity));
     UpdateAfterChange(true, true);
     OnAfterUserAction();
   }
 }
 
 }  // namespace views