| Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| index 1afcea12543ab61f48e4387993a919feebbd39c2..c0a078f35362fcaf289086f0592acd0edca1f6ed 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| @@ -203,19 +203,19 @@ public:
|
| LayoutUnit paddingOver() const { return computedCSSPaddingOver(); }
|
| LayoutUnit paddingUnder() const { return computedCSSPaddingUnder(); }
|
|
|
| - virtual int borderTop() const { return style()->borderTopWidth(); }
|
| - virtual int borderBottom() const { return style()->borderBottomWidth(); }
|
| - virtual int borderLeft() const { return style()->borderLeftWidth(); }
|
| - virtual int borderRight() const { return style()->borderRightWidth(); }
|
| - virtual int borderBefore() const { return style()->borderBeforeWidth(); }
|
| - virtual int borderAfter() const { return style()->borderAfterWidth(); }
|
| - virtual int borderStart() const { return style()->borderStartWidth(); }
|
| - virtual int borderEnd() const { return style()->borderEndWidth(); }
|
| - int borderOver() const { return style()->borderOverWidth(); }
|
| - int borderUnder() const { return style()->borderUnderWidth(); }
|
| -
|
| - int borderWidth() const { return borderLeft() + borderRight(); }
|
| - int borderHeight() const { return borderTop() + borderBottom(); }
|
| + virtual LayoutUnit borderTop() const { return style()->borderTopWidth(); }
|
| + virtual LayoutUnit borderBottom() const { return style()->borderBottomWidth(); }
|
| + virtual LayoutUnit borderLeft() const { return style()->borderLeftWidth(); }
|
| + virtual LayoutUnit borderRight() const { return style()->borderRightWidth(); }
|
| + virtual LayoutUnit borderBefore() const { return style()->borderBeforeWidth(); }
|
| + virtual LayoutUnit borderAfter() const { return style()->borderAfterWidth(); }
|
| + virtual LayoutUnit borderStart() const { return style()->borderStartWidth(); }
|
| + virtual LayoutUnit borderEnd() const { return style()->borderEndWidth(); }
|
| + LayoutUnit borderOver() const { return style()->borderOverWidth(); }
|
| + LayoutUnit borderUnder() const { return style()->borderUnderWidth(); }
|
| +
|
| + LayoutUnit borderWidth() const { return borderLeft() + borderRight(); }
|
| + LayoutUnit borderHeight() const { return borderTop() + borderBottom(); }
|
|
|
| // Insets from the border box to the inside of the border.
|
| LayoutRectOutsets borderInsets() const { return LayoutRectOutsets(-borderTop(), -borderRight(), -borderBottom(), -borderLeft()); }
|
|
|