| Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| index f93e329d6930aba981aa31fad2d7a673f1b4228a..760a7b4ab4cc6eac280886fd79ad79cf77d0340d 100644
|
| --- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| @@ -1602,21 +1602,21 @@ static CSSValueList* valueForBorderRadiusShorthand(const ComputedStyle& style) {
|
|
|
| bool showHorizontalBottomLeft = style.borderTopRightRadius().width() !=
|
| style.borderBottomLeftRadius().width();
|
| - bool showHorizontalBottomRight =
|
| - showHorizontalBottomLeft || (style.borderBottomRightRadius().width() !=
|
| - style.borderTopLeftRadius().width());
|
| - bool showHorizontalTopRight =
|
| - showHorizontalBottomRight || (style.borderTopRightRadius().width() !=
|
| + bool showHorizontalBottomRight = showHorizontalBottomLeft ||
|
| + (style.borderBottomRightRadius().width() !=
|
| style.borderTopLeftRadius().width());
|
| + bool showHorizontalTopRight = showHorizontalBottomRight ||
|
| + (style.borderTopRightRadius().width() !=
|
| + style.borderTopLeftRadius().width());
|
|
|
| bool showVerticalBottomLeft = style.borderTopRightRadius().height() !=
|
| style.borderBottomLeftRadius().height();
|
| - bool showVerticalBottomRight =
|
| - showVerticalBottomLeft || (style.borderBottomRightRadius().height() !=
|
| - style.borderTopLeftRadius().height());
|
| - bool showVerticalTopRight =
|
| - showVerticalBottomRight || (style.borderTopRightRadius().height() !=
|
| + bool showVerticalBottomRight = showVerticalBottomLeft ||
|
| + (style.borderBottomRightRadius().height() !=
|
| style.borderTopLeftRadius().height());
|
| + bool showVerticalTopRight = showVerticalBottomRight ||
|
| + (style.borderTopRightRadius().height() !=
|
| + style.borderTopLeftRadius().height());
|
|
|
| CSSValueList* topLeftRadius =
|
| valuesForBorderRadiusCorner(style.borderTopLeftRadius(), style);
|
| @@ -2231,9 +2231,10 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
|
| ? CSSColorValue::create(
|
| style.visitedDependentColor(CSSPropertyCaretColor).rgb())
|
| : currentColorOrValidColor(
|
| - style, style.caretColor().isAutoColor()
|
| - ? StyleColor::currentColor()
|
| - : style.caretColor().toStyleColor());
|
| + style,
|
| + style.caretColor().isAutoColor()
|
| + ? StyleColor::currentColor()
|
| + : style.caretColor().toStyleColor());
|
| case CSSPropertyClear:
|
| return CSSIdentifierValue::create(style.clear());
|
| case CSSPropertyColor:
|
| @@ -2562,10 +2563,11 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
|
| // when display == EDisplay::Block. Let's calculate the absolute value
|
| // of the specified margin-right % instead of relying on LayoutBox's
|
| // marginRight() value.
|
| - value = minimumValueForLength(
|
| - marginRight, toLayoutBox(layoutObject)
|
| - ->containingBlockLogicalWidthForContent())
|
| - .toFloat();
|
| + value =
|
| + minimumValueForLength(marginRight,
|
| + toLayoutBox(layoutObject)
|
| + ->containingBlockLogicalWidthForContent())
|
| + .toFloat();
|
| } else {
|
| value = toLayoutBox(layoutObject)->marginRight().toFloat();
|
| }
|
| @@ -3259,8 +3261,9 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
|
| CSSPropertyBorderLeft};
|
| for (size_t i = 0; i < WTF_ARRAY_LENGTH(properties); ++i) {
|
| if (!compareCSSValuePtr<CSSValue>(
|
| - value, get(properties[i], style, layoutObject, styledNode,
|
| - allowVisitedStyle)))
|
| + value,
|
| + get(properties[i], style, layoutObject, styledNode,
|
| + allowVisitedStyle)))
|
| return nullptr;
|
| }
|
| return value;
|
|
|