Ensure that we don't allow 'normal' alongside other values in content property

third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

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 3e6d595f16a00cd870f3b561539feee56b9a7102..fc728a12bb13abe81c45f8eae8429ee9ac1bc389 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -657,6 +657,12 @@ void StyleBuilderFunctions::applyInheritCSSPropertyContent(StyleResolverState&)
 
 void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& state, CSSValue* value)
 {
+    if (value->isPrimitiveValue()) {
+        if (toCSSPrimitiveValue(*value).getValueID() == CSSValueNormal) {

[Timothy Loh, 2016/03/24 04:38:41]

should be an assert instead since if we get here this will always be true

[nainar, 2016/03/29 00:56:39]

Done.

+            state.style()->clearContent();
+            return;
+        }
+    }
     // list of string, uri, counter, attr, i
 
     bool didSet = false;