Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 69 matching lines @@
         return CSSPrimitiveValue::UFrequency;
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
         return CSSPrimitiveValue::UResolution;
     default:
         return CSSPrimitiveValue::UOther;
     }
 }
 
-bool CSSPrimitiveValue::colorIsDerivedFromElement() const
-{
-    int valueID = getValueID();
-    switch (valueID) {
-    case CSSValueInternalQuirkInherit:
-    case CSSValueWebkitLink:
-    case CSSValueWebkitActivelink:
-    case CSSValueCurrentcolor:
-        return true;
-    default:
-        return false;
-    }
-}
-
-CSSPrimitiveValue* CSSPrimitiveValue::createIdentifier(CSSValueID valueID)
-{
-    CSSPrimitiveValue* cssValue = cssValuePool().identifierCacheValue(valueID);
-    if (!cssValue)
-        cssValue = cssValuePool().setIdentifierCacheValue(valueID, new CSSPrimitiveValue(valueID));
-    return cssValue;
-}
-
 CSSPrimitiveValue* CSSPrimitiveValue::create(double value, UnitType type)
 {
     // TODO(timloh): This looks wrong.
     if (std::isinf(value))
         value = 0;
 
     if (value < 0 || value > CSSValuePool::maximumCacheableIntegerValue)
         return new CSSPrimitiveValue(value, type);
 
     int intValue = static_cast<int>(value);
@@ skipping 57 matching lines @@
     case CalcPercentLengthNumber:
         return UnitType::CalcPercentageWithLengthAndNumber;
     case CalcTime:
         return UnitType::Milliseconds;
     case CalcOther:
         return UnitType::Unknown;
     }
     return UnitType::Unknown;
 }
 
-static const AtomicString& valueName(CSSValueID valueID)
-{
-    DCHECK_GE(valueID, 0);
-    DCHECK_LT(valueID, numCSSValueKeywords);
-
-    if (valueID < 0)
-        return nullAtom;
-
-    static AtomicString* keywordStrings = new AtomicString[numCSSValueKeywords]; // Leaked intentionally.
-    AtomicString& keywordString = keywordStrings[valueID];
-    if (keywordString.isNull())
-        keywordString = getValueName(valueID);
-    return keywordString;
-}
-
-CSSPrimitiveValue::CSSPrimitiveValue(CSSValueID valueID)
-    : CSSValue(PrimitiveClass)
-{
-    init(UnitType::ValueID);
-    // TODO(sashab): Add a DCHECK_NE(valueID, CSSValueInvalid).
-    m_value.valueID = valueID;
-}
-
 CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     init(type);
     ASSERT(std::isfinite(num));
     m_value.num = num;
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
     : CSSValue(PrimitiveClass)
 {
     switch (length.type()) {
-    case Auto:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueAuto;
-        break;
-    case MinContent:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueMinContent;
-        break;
-    case MaxContent:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueMaxContent;
-        break;
-    case FillAvailable:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueWebkitFillAvailable;
-        break;
-    case FitContent:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueFitContent;
-        break;
-    case ExtendToZoom:
-        init(UnitType::ValueID);
-        m_value.valueID = CSSValueInternalExtendToZoom;
-        break;
     case Percent:
         init(UnitType::Percentage);
         ASSERT(std::isfinite(length.percent()));
         m_value.num = length.percent();
         break;
     case Fixed:
         init(UnitType::Pixels);
         m_value.num = length.value() / zoom;
         break;
     case Calculated: {
         const CalculationValue& calc = length.getCalculationValue();
         if (calc.pixels() && calc.percent()) {
             init(CSSCalcValue::create(
                 CSSCalcValue::createExpressionNode(calc.pixels() / zoom, calc.percent()),
                 calc.getValueRange()));
             break;
         }
         if (calc.percent()) {
             init(UnitType::Percentage);
             m_value.num = calc.percent();
         } else {
             init(UnitType::Pixels);
             m_value.num = calc.pixels() / zoom;
         }
         if (m_value.num < 0 && calc.isNonNegative())
             m_value.num = 0;
         break;
     }
+    case Auto:
+    case MinContent:
+    case MaxContent:
+    case FillAvailable:
+    case FitContent:
+    case ExtendToZoom:
     case DeviceWidth:
     case DeviceHeight:
     case MaxSizeNone:
         ASSERT_NOT_REACHED();
         break;
     }
 }
 
 void CSSPrimitiveValue::init(UnitType type)
 {
@@ skipping 336 matching lines @@
         return "fr";
     case UnitType::ViewportWidth:
         return "vw";
     case UnitType::ViewportHeight:
         return "vh";
     case UnitType::ViewportMin:
         return "vmin";
     case UnitType::ViewportMax:
         return "vmax";
     case UnitType::Unknown:
-    case UnitType::ValueID:
     case UnitType::Calc:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::CalcLengthWithNumber:
     case UnitType::CalcPercentageWithLengthAndNumber:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
@@ skipping 38 matching lines @@
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::Fraction:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
     case UnitType::ViewportMin:
     case UnitType::ViewportMax:
         text = formatNumber(m_value.num, unitTypeToString(type()));
         break;
-    case UnitType::ValueID:
-        text = valueName(m_value.valueID);
-        break;
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::CalcLengthWithNumber:
     case UnitType::CalcPercentageWithLengthAndNumber:
         ASSERT_NOT_REACHED();
         break;
     }
@@ skipping 35 matching lines @@
     case UnitType::Seconds:
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
     case UnitType::ViewportMin:
     case UnitType::ViewportMax:
     case UnitType::Fraction:
         return m_value.num == other.m_value.num;
-    case UnitType::ValueID:
-        return m_value.valueID == other.m_value.valueID;
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::CalcLengthWithNumber:
     case UnitType::CalcPercentageWithLengthAndNumber:
     case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
     switch (type()) {
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink