Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 117 matching lines @@
     default:
         return FontDescription::NoFamily;
     }
 }
 
 static bool convertFontFamilyName(StyleResolverState& state, CSSValue* value,
     FontDescription::GenericFamilyType& genericFamily, AtomicString& familyName)
 {
     if (value->isCustomIdentValue()) {
         genericFamily = FontDescription::NoFamily;
-        familyName = AtomicString(toCSSCustomIdentValue(value)->value());
+        familyName = AtomicString(toCSSCustomIdentValue(value)->string());
     } else if (state.document().settings()) {
         genericFamily = convertGenericFamily(toCSSPrimitiveValue(value)->getValueID());
         familyName = state.fontBuilder().genericFontFamilyName(genericFamily);
     }
 
     return !familyName.isEmpty();
 }
 
 FontDescription::FamilyDescription StyleBuilderConverter::convertFontFamily(StyleResolverState& state, CSSValue* value)
 {
@@ skipping 262 matching lines @@
 GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSSValue* value)
 {
     // We accept the specification's grammar:
     // 'auto' | [ <integer> || <custom-ident> ] | [ span && [ <integer> || <custom-ident> ] ] | <custom-ident>
 
     GridPosition position;
 
     if (value->isCustomIdentValue()) {
         // We translate <custom-ident> to <string> during parsing as it
         // makes handling it more simple.
-        position.setNamedGridArea(toCSSCustomIdentValue(value)->value());
+        position.setNamedGridArea(toCSSCustomIdentValue(value)->string());
         return position;
     }
 
     if (value->isPrimitiveValue()) {
         ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto);
         return position;
     }
 
     CSSValueList* values = toCSSValueList(value);
     ASSERT(values->length());
@@ skipping 11 matching lines @@
         currentValue = it != values->end() ? it->get() : nullptr;
     }
 
     if (currentValue && currentValue->isPrimitiveValue() && toCSSPrimitiveValue(currentValue)->isNumber()) {
         gridLineNumber = toCSSPrimitiveValue(currentValue)->getIntValue();
         ++it;
         currentValue = it != values->end() ? it->get() : nullptr;
     }
 
     if (currentValue && currentValue->isCustomIdentValue()) {
-        gridLineName = toCSSCustomIdentValue(currentValue)->value();
+        gridLineName = toCSSCustomIdentValue(currentValue)->string();
         ++it;
     }
 
     ASSERT(it == values->end());
     if (isSpanPosition)
         position.setSpanPosition(gridLineNumber, gridLineName);
     else
         position.setExplicitPosition(gridLineNumber, gridLineName);
 
     return position;
@@ skipping 15 matching lines @@
 {
     if (value->isPrimitiveValue()) {
         ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
         return;
     }
 
     size_t currentNamedGridLine = 0;
     for (auto& currValue : *toCSSValueList(value)) {
         if (currValue->isGridLineNamesValue()) {
             for (auto& namedGridLineValue : toCSSGridLineNamesValue(*currValue)) {
-                String namedGridLine = toCSSCustomIdentValue(namedGridLineValue.get())->value();
+                String namedGridLine = toCSSCustomIdentValue(namedGridLineValue.get())->string();
                 NamedGridLinesMap::AddResult result = namedGridLines.add(namedGridLine, Vector<size_t>());
                 result.storedValue->value.append(currentNamedGridLine);
                 OrderedNamedGridLines::AddResult orderedInsertionResult = orderedNamedGridLines.add(currentNamedGridLine, Vector<String>());
                 orderedInsertionResult.storedValue->value.append(namedGridLine);
             }
             continue;
         }
 
         ++currentNamedGridLine;
         trackSizes.append(convertGridTrackSize(state, currValue.get()));
@@ skipping 463 matching lines @@
     return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale3D);
 }
 
 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(StyleResolverState& state, CSSValue* value)
 {
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrientation : DoNotRespectImageOrientation;
 }
 
 } // namespace blink