| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| index d8c9c2bba30a8f62674f3253bf2aa23f13848807..99e261c588767492591e8552c8f1d67586cef05c 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -1514,7 +1514,7 @@ int ComputedStyle::computedLineHeight() const
|
| if (lh.isNegative() && font().primaryFont())
|
| return getFontMetrics().lineSpacing();
|
|
|
| - if (lh.hasPercent())
|
| + if (lh.isPercentOrCalc())
|
| return minimumValueForLength(lh, LayoutUnit(computedFontSize())).toInt();
|
|
|
| return std::min(lh.value(), LayoutUnit::max().toFloat());
|
|
|