Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
index f28b849db8d34d0d49e781866684d682b118be8e..70c623d7df0e6e39bb1f293f212caf833a5beb7f 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
@@ -113,8 +113,9 @@ static inline bool isValidVisitedLinkProperty(CSSPropertyID id) { |
void StyleBuilder::applyProperty(CSSPropertyID id, |
StyleResolverState& state, |
const CSSValue& value) { |
- if (id != CSSPropertyVariable && (value.isVariableReferenceValue() || |
- value.isPendingSubstitutionValue())) { |
+ if (id != CSSPropertyVariable && |
+ (value.isVariableReferenceValue() || |
+ value.isPendingSubstitutionValue())) { |
bool omitAnimationTainted = CSSAnimations::isAnimationAffectingProperty(id); |
const CSSValue* resolvedValue = |
CSSVariableResolver::resolveVariableReferences(state, id, value, |
@@ -127,8 +128,8 @@ void StyleBuilder::applyProperty(CSSPropertyID id, |
return; |
} |
- DCHECK(!isShorthandProperty(id)) << "Shorthand property id = " << id |
- << " wasn't expanded at parsing time"; |
+ DCHECK(!isShorthandProperty(id)) |
+ << "Shorthand property id = " << id << " wasn't expanded at parsing time"; |
bool isInherit = state.parentNode() && value.isInheritedValue(); |
bool isInitial = value.isInitialValue() || |
@@ -938,10 +939,9 @@ void StyleBuilderFunctions::applyValueCSSPropertyVariable( |
CSSVariableData* parentValue = |
state.parentStyle()->getVariable(name, isInheritedProperty); |
const CSSValue* parentCSSValue = |
- registration && parentValue |
- ? state.parentStyle()->getRegisteredVariable(name, |
- isInheritedProperty) |
- : nullptr; |
+ registration && parentValue ? state.parentStyle()->getRegisteredVariable( |
+ name, isInheritedProperty) |
+ : nullptr; |
if (!isInheritedProperty) { |
DCHECK(registration); |