Index: third_party/WebKit/Source/core/layout/line/InlineFlowBox.h |
diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h |
index acf143bc97088ab3e65da4b38df9a7cae9aa5596..7a27bf6871462dcf99e9e91c50049a08772bd5b5 100644 |
--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h |
+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h |
@@ -174,27 +174,23 @@ class InlineFlowBox : public InlineBox { |
LayoutUnit marginLogicalWidth() const { |
return marginLogicalLeft() + marginLogicalRight(); |
} |
- int borderLogicalLeft() const { |
+ LayoutUnit borderLogicalLeft() const { |
if (!includeLogicalLeftEdge()) |
- return 0; |
- return isHorizontal() |
- ? getLineLayoutItem() |
- .style(isFirstLineStyle()) |
- ->borderLeftWidth() |
- : getLineLayoutItem() |
- .style(isFirstLineStyle()) |
- ->borderTopWidth(); |
- } |
- int borderLogicalRight() const { |
+ return LayoutUnit(); |
+ return LayoutUnit( |
+ isHorizontal() |
+ ? getLineLayoutItem().style(isFirstLineStyle())->borderLeftWidth() |
+ : getLineLayoutItem().style(isFirstLineStyle())->borderTopWidth()); |
+ } |
+ LayoutUnit borderLogicalRight() const { |
if (!includeLogicalRightEdge()) |
- return 0; |
- return isHorizontal() |
- ? getLineLayoutItem() |
- .style(isFirstLineStyle()) |
- ->borderRightWidth() |
- : getLineLayoutItem() |
- .style(isFirstLineStyle()) |
- ->borderBottomWidth(); |
+ return LayoutUnit(); |
+ return LayoutUnit( |
+ isHorizontal() |
+ ? getLineLayoutItem().style(isFirstLineStyle())->borderRightWidth() |
+ : getLineLayoutItem() |
+ .style(isFirstLineStyle()) |
+ ->borderBottomWidth()); |
} |
int paddingLogicalLeft() const { |
if (!includeLogicalLeftEdge()) |