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 1b5ca74b866fff9cd404898b17106bbdb63c959f..d12bc930414a3da5ab483b539b8f86f3497dd8cb 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -63,7 +63,8 @@ namespace blink { |
struct SameSizeAsBorderValue { |
RGBA32 m_color; |
- unsigned m_width; |
+ float m_width; |
+ unsigned m_bitfield; |
}; |
ASSERT_SIZE(BorderValue, SameSizeAsBorderValue); |
@@ -2222,7 +2223,7 @@ const BorderValue& ComputedStyle::borderEnd() const { |
return isLeftToRightDirection() ? borderBottom() : borderTop(); |
} |
-int ComputedStyle::borderBeforeWidth() const { |
+float ComputedStyle::borderBeforeWidth() const { |
switch (getWritingMode()) { |
case WritingMode::kHorizontalTb: |
return borderTopWidth(); |
@@ -2235,7 +2236,7 @@ int ComputedStyle::borderBeforeWidth() const { |
return borderTopWidth(); |
} |
-int ComputedStyle::borderAfterWidth() const { |
+float ComputedStyle::borderAfterWidth() const { |
switch (getWritingMode()) { |
case WritingMode::kHorizontalTb: |
return borderBottomWidth(); |
@@ -2248,23 +2249,23 @@ int ComputedStyle::borderAfterWidth() const { |
return borderBottomWidth(); |
} |
-int ComputedStyle::borderStartWidth() const { |
+float ComputedStyle::borderStartWidth() const { |
if (isHorizontalWritingMode()) |
return isLeftToRightDirection() ? borderLeftWidth() : borderRightWidth(); |
return isLeftToRightDirection() ? borderTopWidth() : borderBottomWidth(); |
} |
-int ComputedStyle::borderEndWidth() const { |
+float ComputedStyle::borderEndWidth() const { |
if (isHorizontalWritingMode()) |
return isLeftToRightDirection() ? borderRightWidth() : borderLeftWidth(); |
return isLeftToRightDirection() ? borderBottomWidth() : borderTopWidth(); |
} |
-int ComputedStyle::borderOverWidth() const { |
+float ComputedStyle::borderOverWidth() const { |
return isHorizontalWritingMode() ? borderTopWidth() : borderRightWidth(); |
} |
-int ComputedStyle::borderUnderWidth() const { |
+float ComputedStyle::borderUnderWidth() const { |
return isHorizontalWritingMode() ? borderBottomWidth() : borderLeftWidth(); |
} |