Split out String, URI and CustomIdent from CSSPrimitiveValue

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 b0ece3ecb0a6ba05cd94055f2fd5f215e284c1cf..d4d53e3d3eb243dad8e0715a0ee430a52a496705 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -54,6 +54,7 @@
 #include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyMetadata.h"
+#include "core/css/CSSURIValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
@@ -569,16 +570,14 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverSta
     if (value->isBasicShapeValue()) {
         state.style()->setClipPath(ShapeClipPathOperation::create(basicShapeForValue(state, *value)));
     }
-    if (value->isPrimitiveValue()) {
-        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-        if (primitiveValue->getValueID() == CSSValueNone) {
-            state.style()->setClipPath(nullptr);
-        } else if (primitiveValue->isURI()) {
-            String cssURLValue = primitiveValue->getStringValue();
-            KURL url = state.document().completeURL(cssURLValue);
-            // FIXME: It doesn't work with forward or external SVG references (see https://bugs.webkit.org/show_bug.cgi?id=90405)
-            state.style()->setClipPath(ReferenceClipPathOperation::create(cssURLValue, AtomicString(url.fragmentIdentifier())));
-        }
+    if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone) {
+        state.style()->setClipPath(nullptr);
+    }
+    if (value->isURIValue()) {
+        String cssURLValue = toCSSURIValue(value)->value();
+        KURL url = state.document().completeURL(cssURLValue);
+        // FIXME: It doesn't work with forward or external SVG references (see https://bugs.webkit.org/show_bug.cgi?id=90405)
+        state.style()->setClipPath(ReferenceClipPathOperation::create(cssURLValue, AtomicString(url.fragmentIdentifier())));
     }
 }
 
@@ -628,15 +627,15 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
         return;
     }
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-
-    if (primitiveValue->isString()) {
+    if (value->isStringValue()) {
         state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
         state.style()->setTextEmphasisMark(TextEmphasisMarkCustom);
-        state.style()->setTextEmphasisCustomMark(AtomicString(primitiveValue->getStringValue()));
+        state.style()->setTextEmphasisCustomMark(AtomicString(toCSSStringValue(value)->value()));
         return;
     }
 
+    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+
     state.style()->setTextEmphasisCustomMark(nullAtom);
 
     if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getValueID() == CSSValueOpen) {
@@ -738,22 +737,20 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta
                 state.style()->setUnique();
             else
                 state.parentStyle()->setUnique();
-            QualifiedName attr(nullAtom, AtomicString(toCSSPrimitiveValue(functionValue->item(0))->getStringValue()), nullAtom);
+            QualifiedName attr(nullAtom, AtomicString(toCSSCustomIdentValue(functionValue->item(0))->value()), nullAtom);
             const AtomicString& value = state.element()->getAttribute(attr);
             state.style()->setContent(value.isNull() ? emptyString() : value.string(), didSet);
             didSet = true;
         }
 
-        if (!item->isPrimitiveValue())
+        if (!item->isPrimitiveValue() && !item->isStringValue())
             continue;
 
-        CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item.get());
-
-        if (contentValue->isString()) {
-            state.style()->setContent(contentValue->getStringValue().impl(), didSet);
+        if (item->isStringValue()) {
+            state.style()->setContent(toCSSStringValue(*item).value().impl(), didSet);
             didSet = true;
         } else {
-            switch (contentValue->getValueID()) {
+            switch (toCSSPrimitiveValue(*item).getValueID()) {
             case CSSValueOpenQuote:
                 state.style()->setContent(OPEN_QUOTE, didSet);
                 didSet = true;
@@ -782,12 +779,10 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta
 
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState& state, CSSValue* value)
 {
-    const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    if (primitiveValue->getValueID() == CSSValueAuto) {
+    if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto) {
         state.style()->setLocale(nullAtom);

[Timothy Loh, 2015/10/02 05:35:25]

Probably more sensible to assert the id is auto instead of checking it.

[sashab, 2015/10/02 06:07:54]

Ahh good call, I did this everywhere else but didn't here. Thanks!

     } else {
-        ASSERT(primitiveValue->isString());
-        state.style()->setLocale(AtomicString(primitiveValue->getStringValue()));
+        state.style()->setLocale(AtomicString(toCSSStringValue(value)->value()));
     }
     state.fontBuilder().setScript(state.style()->locale());
 }