CSSValue Immediates: Change CSSValue to an object instead of a pointer

Source/core/css/CSSImageSetValue.cpp

 /*
  * Copyright (C) 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 42 matching lines @@
 {
     if (m_imageSet && m_imageSet->isImageResourceSet())
         toStyleFetchedImageSet(m_imageSet)->clearImageSetValue();
 }
 
 void CSSImageSetValue::fillImageSet()
 {
     size_t length = this->length();
     size_t i = 0;
     while (i < length) {
-        CSSImageValue* imageValue = toCSSImageValue(item(i));
-        String imageURL = imageValue->url();
+        CSSImageValue& imageValue = toCSSImageValue(item(i));
+        String imageURL = imageValue.url();
 
         ++i;
         ASSERT_WITH_SECURITY_IMPLICATION(i < length);
-        CSSValue* scaleFactorValue = item(i);
-        float scaleFactor = toCSSPrimitiveValue(scaleFactorValue)->getFloatValue();
+        CSSValue scaleFactorValue = item(i);
+        float scaleFactor = toCSSPrimitiveValue(scaleFactorValue).getFloatValue();
 
         ImageWithScale image;
         image.imageURL = imageURL;
-        image.referrer = SecurityPolicy::generateReferrer(imageValue->referrer().referrerPolicy, KURL(ParsedURLString, imageURL), imageValue->referrer().referrer);
+        image.referrer = SecurityPolicy::generateReferrer(imageValue.referrer().referrerPolicy, KURL(ParsedURLString, imageURL), imageValue.referrer().referrer);
         image.scaleFactor = scaleFactor;
         m_imagesInSet.append(image);
         ++i;
     }
 
     // Sort the images so that they are stored in order from lowest resolution to highest.
     std::sort(m_imagesInSet.begin(), m_imagesInSet.end(), CSSImageSetValue::compareByScaleFactor);
 }
 
 CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
@@ skipping 61 matching lines @@
 {
     StringBuilder result;
     result.append("-webkit-image-set(");
 
     size_t length = this->length();
     size_t i = 0;
     while (i < length) {
         if (i > 0)
             result.appendLiteral(", ");
 
-        const CSSValue* imageValue = item(i);
-        result.append(imageValue->cssText());
+        const CSSValue imageValue = item(i);
+        result.append(imageValue.cssText());
         result.append(' ');
 
         ++i;
         ASSERT_WITH_SECURITY_IMPLICATION(i < length);
-        const CSSValue* scaleFactorValue = item(i);
-        result.append(scaleFactorValue->cssText());
+        const CSSValue scaleFactorValue = item(i);
+        result.append(scaleFactorValue.cssText());
         // FIXME: Eventually the scale factor should contain it's own unit http://wkb.ug/100120.
         // For now 'x' is hard-coded in the parser, so we hard-code it here too.
         result.append('x');
 
         ++i;
     }
 
     result.append(')');
     return result.toString();
 }
 
 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const
 {
     if (!m_imageSet || !m_imageSet->isImageResourceSet())
         return false;
     if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedImage())
         return cachedResource->loadFailedOrCanceled();
     return true;
 }
 
 } // namespace blink