Split out Color from CSSPrimitiveValue

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

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
 {
     DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWillBeNoop(new CSSValuePool())));
     return *pool;
 }
 
 CSSValuePool::CSSValuePool()
     : m_inheritedValue(CSSInheritedValue::create())
     , m_implicitInitialValue(CSSInitialValue::createImplicit())
     , m_explicitInitialValue(CSSInitialValue::createExplicit())
     , m_unsetValue(CSSUnsetValue::create())
-    , m_colorTransparent(CSSPrimitiveValue::createColor(Color::transparent))
-    , m_colorWhite(CSSPrimitiveValue::createColor(Color::white))
-    , m_colorBlack(CSSPrimitiveValue::createColor(Color::black))
+    , m_colorTransparent(CSSColorValue::create(Color::transparent))
+    , m_colorWhite(CSSColorValue::create(Color::white))
+    , m_colorBlack(CSSColorValue::create(Color::black))
 {
     m_identifierValueCache.resize(numCSSValueKeywords);
     m_pixelValueCache.resize(maximumCacheableIntegerValue + 1);
     m_percentValueCache.resize(maximumCacheableIntegerValue + 1);
     m_numberValueCache.resize(maximumCacheableIntegerValue + 1);
 }
 
 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
 {
     if (ident <= 0)
         return CSSPrimitiveValue::createIdentifier(ident);
 
     if (!m_identifierValueCache[ident])
         m_identifierValueCache[ident] = CSSPrimitiveValue::createIdentifier(ident);
     return m_identifierValueCache[ident];
 }
 
 PassRefPtrWillBeRawPtr<CSSCustomIdentValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
 {
     return CSSCustomIdentValue::create(ident);
 }
 
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigned rgbValue)
+PassRefPtrWillBeRawPtr<CSSColorValue> CSSValuePool::createColorValue(RGBA32 rgbValue)
 {
     // These are the empty and deleted values of the hash table.
     if (rgbValue == Color::transparent)
         return m_colorTransparent;
     if (rgbValue == Color::white)
         return m_colorWhite;
     // Just because it is common.
     if (rgbValue == Color::black)
         return m_colorBlack;
 
     // Just wipe out the cache and start rebuilding if it gets too big.
     const unsigned maximumColorCacheSize = 512;
     if (m_colorValueCache.size() > maximumColorCacheSize)
         m_colorValueCache.clear();
 
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> dummyValue = nullptr;
+    RefPtrWillBeRawPtr<CSSColorValue> dummyValue = nullptr;
     ColorValueCache::AddResult entry = m_colorValueCache.add(rgbValue, dummyValue);
     if (entry.isNewEntry)
-        entry.storedValue->value = CSSPrimitiveValue::createColor(rgbValue);
+        entry.storedValue->value = CSSColorValue::create(rgbValue);
     return entry.storedValue->value;
 }
 
 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitType type)
 {
     if (std::isinf(value))
         value = 0;
 
     if (value < 0 || value > maximumCacheableIntegerValue)
         return CSSPrimitiveValue::create(value, type);
@@ skipping 63 matching lines @@
     visitor->trace(m_colorBlack);
     visitor->trace(m_pixelValueCache);
     visitor->trace(m_percentValueCache);
     visitor->trace(m_numberValueCache);
     visitor->trace(m_fontFaceValueCache);
     visitor->trace(m_fontFamilyValueCache);
 #endif
 }
 
 }