| 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 0366fe8aa3de72cd44c0bcc5ee5c14a5faec2b3d..d762b843cb68937c0613e82a659970c84caeed2e 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| @@ -288,7 +288,7 @@ PassRefPtr<ComputedStyle> LayoutTextControlSingleLine::createInnerEditorStyle(co
|
| // in which we don't want to remove line-height with percent or calculated
|
| // length.
|
| // TODO(tkent): This should be done during layout.
|
| - if (logicalHeight.hasPercent() || (logicalHeight.isFixed() && logicalHeight.getFloatValue() > computedLineHeight))
|
| + if (logicalHeight.isPercentOrCalc() || (logicalHeight.isFixed() && logicalHeight.getFloatValue() > computedLineHeight))
|
| textBlockStyle->setLineHeight(ComputedStyle::initialLineHeight());
|
|
|
| textBlockStyle->setDisplay(BLOCK);
|
|
|