CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/CSSCrossfadeValue.cpp

 /*
  * Copyright (C) 2011 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 86 matching lines @@
     result.appendLiteral(", ");
     result.append(m_toValue.cssText());
     result.appendLiteral(", ");
     result.append(m_percentageValue->cssText());
     result.append(')');
     return result.toString();
 }
 
 IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* layoutObject)
 {
-    float percentage = m_percentageValue->getFloatValue();
+    float percentage = toCSSPrimitiveValue(*m_percentageValue).getFloatValue();
     float inversePercentage = 1 - percentage;
 
     Document* document = &layoutObject->document();
     ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue, document);
     ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue, document);
 
     if (!cachedFromImage || !cachedToImage)
         return IntSize();
 
     IntSize fromImageSize = cachedFromImage->imageForLayoutObject(layoutObject)->size();
@@ skipping 54 matching lines @@
 
     if (!cachedFromImage || !cachedToImage)
         return Image::nullImage();
 
     Image* fromImage = cachedFromImage->imageForLayoutObject(layoutObject);
     Image* toImage = cachedToImage->imageForLayoutObject(layoutObject);
 
     if (!fromImage || !toImage)
         return Image::nullImage();
 
-    m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
+    m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, toCSSPrimitiveValue(*m_percentageValue).getFloatValue(), fixedSize(layoutObject), size);
 
     return m_generatedImage.release();
 }
 
 void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
 {
     for (const auto& curr : clients()) {
         LayoutObject* client = const_cast<LayoutObject*>(curr.key);
         client->imageChanged(static_cast<WrappedImagePtr>(this));
     }
@@ skipping 11 matching lines @@
         return true;
     if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled())
         return true;
     return false;
 }
 
 bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const
 {
     return m_fromValue.equals(other.m_fromValue)
         && m_toValue.equals(other.m_toValue)
-        && compareCSSValuePtr(m_percentageValue, other.m_percentageValue);
+        && m_percentageValue == other.m_percentageValue;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink