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 cd022b7aee4927c4878359ecf181316282ef03cd..6e69f4852510e92ef3e5f33b6eb2254cd9fd04bf 100644 |
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
@@ -1906,10 +1906,14 @@ CSSValue* ComputedStyleCSSValueMapping::ValueForFont( |
// this serialization. |
CSSValue* ligatures_value = ValueForFontVariantLigatures(style); |
CSSValue* numeric_value = ValueForFontVariantNumeric(style); |
- if (!DataEquivalent<CSSValue>(ligatures_value, |
- CSSIdentifierValue::Create(CSSValueNormal)) || |
- !DataEquivalent<CSSValue>(numeric_value, |
- CSSIdentifierValue::Create(CSSValueNormal))) |
+ // FIXME: Use DataEquivalent<CSSValue>(...) once http://crbug.com/729447 is |
+ // resolved. |
+ if (!DataEquivalent( |
+ ligatures_value, |
+ static_cast<CSSValue*>(CSSIdentifierValue::Create(CSSValueNormal))) || |
+ !DataEquivalent( |
+ numeric_value, |
+ static_cast<CSSValue*>(CSSIdentifierValue::Create(CSSValueNormal)))) |
return nullptr; |
CSSIdentifierValue* caps_value = ValueForFontVariantCaps(style); |