Split out String, URI and CustomIdent from CSSPrimitiveValue

Source/core/css/resolver/StyleBuilderCustom.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
@@ skipping 553 matching lines @@
 }
 
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverState& state, CSSValue* value)
 {
     if (value->isPrimitiveValue()) {
         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
         if (primitiveValue->getValueID() == CSSValueNone) {
             state.style()->setClipPath(nullptr);
         } else if (primitiveValue->isShape()) {
             state.style()->setClipPath(ShapeClipPathOperation::create(basicShapeForValue(state, primitiveValue->getShapeValue())));
-        } 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())));
         }
+    } else 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())));
     }
 }
 
 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState& state, CSSValue* value)
 {
     // FIXME: We should just make this a converter
     FilterOperations operations;
     FilterOperationResolver::createFilterOperations(*value, state.cssToLengthConversionData(), operations, state);
     state.style()->setFilter(operations);
 }
@@ skipping 29 matching lines @@
             CSSPrimitiveValue* value = toCSSPrimitiveValue(list->item(i));
             if (value->getValueID() == CSSValueFilled || value->getValueID() == CSSValueOpen)
                 state.style()->setTextEmphasisFill(*value);
             else
                 state.style()->setTextEmphasisMark(*value);
         }
         state.style()->setTextEmphasisCustomMark(nullAtom);
         return;
     }
 
+    if (value->isStringValue()) {
+        state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
+        state.style()->setTextEmphasisMark(TextEmphasisMarkCustom);
+        state.style()->setTextEmphasisCustomMark(AtomicString(toCSSStringValue(value)->value()));
+        return;
+    }
+
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-
-    if (primitiveValue->isString()) {
-        state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
-        state.style()->setTextEmphasisMark(TextEmphasisMarkCustom);
-        state.style()->setTextEmphasisCustomMark(AtomicString(primitiveValue->getStringValue()));
-        return;
-    }
-
     state.style()->setTextEmphasisCustomMark(nullAtom);
 
     if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getValueID() == CSSValueOpen) {
         state.style()->setTextEmphasisFill(*primitiveValue);
         state.style()->setTextEmphasisMark(TextEmphasisMarkAuto);
     } else {
         state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
         state.style()->setTextEmphasisMark(*primitiveValue);
     }
 }
@@ skipping 81 matching lines @@
         }
 
         if (item->isFunctionValue()) {
             CSSFunctionValue* functionValue = toCSSFunctionValue(item.get());
             ASSERT(functionValue->functionType() == CSSValueAttr);
             // FIXME: Can a namespace be specified for an attr(foo)?
             if (state.style()->styleType() == NOPSEUDO)
                 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())

[alancutter (OOO until 2018), 2015/09/17 02:59:29]

Shouldn't this be ||?

[sashab, 2015/09/17 04:19:49]

It's a bit confusing, but it should be &&. "If the item is not a primitive value
and is not a string value..."

Changed it to !(... || ...) to make it easier to read.

EDIT: Moved it into the if/else statement below.

             continue;
 
-        CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item.get());
-
-        if (contentValue->isString()) {
-            state.style()->setContent(contentValue->getStringValue().impl(), didSet);
+        if (item->isStringValue()) {
+            CSSStringValue* contentValue = toCSSStringValue(item.get());
+            state.style()->setContent(contentValue->value().impl(), didSet);
             didSet = true;
         } else {
+            CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item.get());
             switch (contentValue->getValueID()) {
             case CSSValueOpenQuote:
                 state.style()->setContent(OPEN_QUOTE, didSet);
                 didSet = true;
                 break;
             case CSSValueCloseQuote:
                 state.style()->setContent(CLOSE_QUOTE, didSet);
                 didSet = true;
                 break;
             case CSSValueNoOpenQuote:
                 state.style()->setContent(NO_OPEN_QUOTE, didSet);
                 didSet = true;
                 break;
             case CSSValueNoCloseQuote:
                 state.style()->setContent(NO_CLOSE_QUOTE, didSet);
                 didSet = true;
                 break;
             default:
                 // normal and none do not have any effect.
                 { }
             }
         }
     }
     if (!didSet)
         state.style()->clearContent();
 }
 
 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);
     } else {
-        ASSERT(primitiveValue->isString());
-        state.style()->setLocale(AtomicString(primitiveValue->getStringValue()));
+        state.style()->setLocale(AtomicString(toCSSStringValue(value)->value()));
     }
     state.fontBuilder().setScript(state.style()->locale());
 }
 
 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAppRegion(StyleResolverState&)
 {
 }
 
 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolverState&)
 {
@@ skipping 45 matching lines @@
         return;
     case CSSValueSuper:
         svgStyle.setBaselineShift(BS_SUPER);
         return;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink