| 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 d4ecea553149fae5db25b9120f62e06e9f4021a2..300cd3703edd3d9b9e2b96b1d1497bed4c3fef18 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -1493,7 +1493,7 @@ int ComputedStyle::computedLineHeight() const
|
| return getFontMetrics().lineSpacing();
|
|
|
| if (lh.hasPercent())
|
| - return minimumValueForLength(lh, LayoutUnit(computedFontSize()));
|
| + return minimumValueForLength(lh, LayoutUnit(computedFontSize())).toInt();
|
|
|
| return std::min(lh.value(), LayoutUnit::max().toFloat());
|
| }
|
| @@ -1956,22 +1956,22 @@ void ComputedStyle::getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLef
|
| {
|
| bool horizontal = isHorizontalWritingMode();
|
|
|
| - edges[BSTop] = BorderEdge(LayoutUnit(borderTopWidth()),
|
| + edges[BSTop] = BorderEdge(borderTopWidth(),
|
| visitedDependentColor(CSSPropertyBorderTopColor),
|
| borderTopStyle(),
|
| horizontal || includeLogicalLeftEdge);
|
|
|
| - edges[BSRight] = BorderEdge(LayoutUnit(borderRightWidth()),
|
| + edges[BSRight] = BorderEdge(borderRightWidth(),
|
| visitedDependentColor(CSSPropertyBorderRightColor),
|
| borderRightStyle(),
|
| !horizontal || includeLogicalRightEdge);
|
|
|
| - edges[BSBottom] = BorderEdge(LayoutUnit(borderBottomWidth()),
|
| + edges[BSBottom] = BorderEdge(borderBottomWidth(),
|
| visitedDependentColor(CSSPropertyBorderBottomColor),
|
| borderBottomStyle(),
|
| horizontal || includeLogicalRightEdge);
|
|
|
| - edges[BSLeft] = BorderEdge(LayoutUnit(borderLeftWidth()),
|
| + edges[BSLeft] = BorderEdge(borderLeftWidth(),
|
| visitedDependentColor(CSSPropertyBorderLeftColor),
|
| borderLeftStyle(),
|
| !horizontal || includeLogicalLeftEdge);
|
|
|