| Index: third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| index b6ce8e2460743a1b824206b091d30e72d05b81ad..8c62e0ee232afc526df56380b916c92fc4fb7c64 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| @@ -365,8 +365,9 @@ PassRefPtr<ComputedStyle> LayoutTextControlSingleLine::createInnerEditorStyle(co
|
|
|
| if (m_desiredInnerEditorLogicalHeight >= 0)
|
| textBlockStyle->setLogicalHeight(Length(m_desiredInnerEditorLogicalHeight, Fixed));
|
| +
|
| // Do not allow line-height to be smaller than our default.
|
| - if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes))
|
| + if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes) && startStyle.height().isIntrinsicOrAuto())
|
| textBlockStyle->setLineHeight(ComputedStyle::initialLineHeight());
|
|
|
| textBlockStyle->setDisplay(BLOCK);
|
|
|