Split out Color from CSSPrimitiveValue

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 202 matching lines @@
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     init(type);
     ASSERT(std::isfinite(num));
     m_value.num = num;
 }
 
-CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
-    : CSSValue(PrimitiveClass)
-{
-    init(UnitType::RGBColor);
-    m_value.rgbcolor = color;
-}
-
 CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
     : CSSValue(PrimitiveClass)
 {
     switch (length.type()) {
     case Auto:
         init(UnitType::ValueID);
         m_value.valueID = CSSValueAuto;
         break;
     case Intrinsic:
         init(UnitType::ValueID);
@@ skipping 112 matching lines @@
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
     case UnitType::ViewportMin:
     case UnitType::ViewportMax:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Fraction:
-    case UnitType::RGBColor:
     case UnitType::Unknown:
     case UnitType::ValueID:
         break;
     }
     if (m_hasCachedCSSText) {
         cssTextCache().remove(this);
         m_hasCachedCSSText = false;
     }
 }
 
@@ skipping 406 matching lines @@
     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::RGBColor:
     case UnitType::Calc:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
@@ skipping 38 matching lines @@
     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::RGBColor: {
-        text = Color(m_value.rgbcolor).serializedAsCSSComponentValue();
-        break;
-    }
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         ASSERT_NOT_REACHED();
         break;
     }
 
     ASSERT(!cssTextCache().contains(this));
@@ skipping 33 matching lines @@
     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::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::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
 #if ENABLE(OILPAN)
     switch (type()) {
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink