Split out String, URI and CustomIdent from CSSPrimitiveValue

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 215 matching lines @@
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     init(type);
     ASSERT(std::isfinite(num));
     m_value.num = num;
 }
 
-CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitType type)
-    : CSSValue(PrimitiveClass)
-{
-    init(type);
-    m_value.string = str.impl();
-    if (m_value.string)
-        m_value.string->ref();
-}
-
 CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
     : CSSValue(PrimitiveClass)
 {
     init(UnitType::RGBColor);
     m_value.rgbcolor = color;
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
     : CSSValue(PrimitiveClass)
 {
@@ skipping 86 matching lines @@
 }
 
 CSSPrimitiveValue::~CSSPrimitiveValue()
 {
     cleanup();
 }
 
 void CSSPrimitiveValue::cleanup()
 {
     switch (type()) {
-    case UnitType::CustomIdentifier:
-    case UnitType::String:
-    case UnitType::URI:
-        if (m_value.string)
-            m_value.string->deref();
-        break;
     case UnitType::Calc:
         // We must not call deref() when oilpan is enabled because m_value.calc is traced.
 #if !ENABLE(OILPAN)
         m_value.calc->deref();
 #endif
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         ASSERT_NOT_REACHED();
         break;
@@ skipping 367 matching lines @@
         return CSSPrimitiveValue::UnitType::ViewportMin;
     case UnitTypeViewportMax:
         return CSSPrimitiveValue::UnitType::ViewportMax;
     case LengthUnitTypeCount:
         break;
     }
     ASSERT_NOT_REACHED();
     return CSSPrimitiveValue::UnitType::Unknown;
 }
 
-String CSSPrimitiveValue::getStringValue() const
-{
-    switch (type()) {
-    case UnitType::CustomIdentifier:
-    case UnitType::String:
-    case UnitType::URI:
-        return m_value.string;
-    default:
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return String();
-}
-
 static String formatNumber(double number, const char* suffix, unsigned suffixLength)
 {
 #if OS(WIN) && _MSC_VER < 1900
     unsigned oldFormat = _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     String result = String::format("%.6g", number);
 #if OS(WIN) && _MSC_VER < 1900
     _set_output_format(oldFormat);
 #endif
     result.append(suffix, suffixLength);
@@ skipping 66 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::CustomIdentifier:
-    case UnitType::String:
-    case UnitType::URI:
     case UnitType::ValueID:
     case UnitType::PropertyID:
     case UnitType::RGBColor:
     case UnitType::Calc:
     case UnitType::Shape:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         break;
     };
     ASSERT_NOT_REACHED();
@@ skipping 39 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::CustomIdentifier:
-        text = quoteCSSStringIfNeeded(m_value.string);
-        break;
-    case UnitType::String: {
-        text = serializeString(m_value.string);
-        break;
-    }
-    case UnitType::URI:
-        text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
-        break;
     case UnitType::ValueID:
         text = valueName(m_value.valueID);
         break;
     case UnitType::PropertyID:
         text = propertyName(m_value.propertyID);
         break;
     case UnitType::RGBColor: {
         text = Color(m_value.rgbcolor).serializedAsCSSComponentValue();
         break;
     }
@@ skipping 48 matching lines @@
     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::PropertyID:
         return m_value.propertyID == other.m_value.propertyID;
     case UnitType::ValueID:
         return m_value.valueID == other.m_value.valueID;
-    case UnitType::CustomIdentifier:
-    case UnitType::String:
-    case UnitType::URI:
-        return equal(m_value.string, other.m_value.string);
     case UnitType::RGBColor:
         return m_value.rgbcolor == other.m_value.rgbcolor;
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Shape:
         return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
     case UnitType::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
@@ skipping 14 matching lines @@
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink