| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index f8b0e9a0d2faec907584622e21be33ded96b1d73..683c73ee3df98a0de6c1dfffcb22f4517ebecd44 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -611,31 +611,33 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| void setBorderImageOutset(const BorderImageLengthBox&);
|
|
|
| // Border width properties.
|
| - static unsigned initialBorderWidth() { return 3; }
|
| + static float initialBorderWidth() { return 3; }
|
|
|
| // border-top-width
|
| - int borderTopWidth() const { return m_surround->border.borderTopWidth(); }
|
| - void setBorderTopWidth(unsigned v) {
|
| + float borderTopWidth() const { return m_surround->border.borderTopWidth(); }
|
| + void setBorderTopWidth(float v) {
|
| SET_VAR(m_surround, border.m_top.m_width, v);
|
| }
|
|
|
| // border-bottom-width
|
| - int borderBottomWidth() const {
|
| + float borderBottomWidth() const {
|
| return m_surround->border.borderBottomWidth();
|
| }
|
| - void setBorderBottomWidth(unsigned v) {
|
| + void setBorderBottomWidth(float v) {
|
| SET_VAR(m_surround, border.m_bottom.m_width, v);
|
| }
|
|
|
| // border-left-width
|
| - int borderLeftWidth() const { return m_surround->border.borderLeftWidth(); }
|
| - void setBorderLeftWidth(unsigned v) {
|
| + float borderLeftWidth() const { return m_surround->border.borderLeftWidth(); }
|
| + void setBorderLeftWidth(float v) {
|
| SET_VAR(m_surround, border.m_left.m_width, v);
|
| }
|
|
|
| // border-right-width
|
| - int borderRightWidth() const { return m_surround->border.borderRightWidth(); }
|
| - void setBorderRightWidth(unsigned v) {
|
| + float borderRightWidth() const {
|
| + return m_surround->border.borderRightWidth();
|
| + }
|
| + void setBorderRightWidth(float v) {
|
| SET_VAR(m_surround, border.m_right.m_width, v);
|
| }
|
|
|
| @@ -1456,7 +1458,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
|
|
| // outline-width
|
| static unsigned short initialOutlineWidth() { return 3; }
|
| - int outlineWidth() const {
|
| + unsigned short outlineWidth() const {
|
| if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone)
|
| return 0;
|
| return m_rareNonInheritedData->m_outline.width();
|
| @@ -3181,12 +3183,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| const BorderValue& borderAfter() const;
|
| const BorderValue& borderStart() const;
|
| const BorderValue& borderEnd() const;
|
| - int borderAfterWidth() const;
|
| - int borderBeforeWidth() const;
|
| - int borderEndWidth() const;
|
| - int borderStartWidth() const;
|
| - int borderOverWidth() const;
|
| - int borderUnderWidth() const;
|
| + float borderAfterWidth() const;
|
| + float borderBeforeWidth() const;
|
| + float borderEndWidth() const;
|
| + float borderStartWidth() const;
|
| + float borderOverWidth() const;
|
| + float borderUnderWidth() const;
|
|
|
| bool hasBorderFill() const { return m_surround->border.hasBorderFill(); }
|
| bool hasBorder() const { return m_surround->border.hasBorder(); }
|
|
|