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

Source/core/page/PageSerializer.cpp

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 355 matching lines @@
 void PageSerializer::retrieveResourcesForProperties(const StylePropertySet* styleDeclaration, Document& document)
 {
     if (!styleDeclaration)
         return;
 
     // The background-image and list-style-image (for ul or ol) are the CSS properties
     // that make use of images. We iterate to make sure we include any other
     // image properties there might be.
     unsigned propertyCount = styleDeclaration->propertyCount();
     for (unsigned i = 0; i < propertyCount; ++i) {
-        RefPtrWillBeRawPtr<CSSValue> cssValue = styleDeclaration->propertyAt(i).value();
-        retrieveResourcesForCSSValue(cssValue.get(), document);
+        CSSValue cssValue = styleDeclaration->propertyAt(i).value();
+        retrieveResourcesForCSSValue(cssValue, document);
     }
 }
 
-void PageSerializer::retrieveResourcesForCSSValue(CSSValue* cssValue, Document& document)
+void PageSerializer::retrieveResourcesForCSSValue(CSSValue cssValue, Document& document)
 {
-    if (cssValue->isImageValue()) {
-        CSSImageValue* imageValue = toCSSImageValue(cssValue);
-        StyleImage* styleImage = imageValue->cachedOrPendingImage();
+    if (cssValue.isImageValue()) {
+        CSSImageValue& imageValue = toCSSImageValue(cssValue);
+        StyleImage* styleImage = imageValue.cachedOrPendingImage();
         // Non cached-images are just place-holders and do not contain data.
         if (!styleImage || !styleImage->isImageResource())
             return;
 
         addImageToResources(styleImage->cachedImage(), nullptr, styleImage->cachedImage()->url());
-    } else if (cssValue->isFontFaceSrcValue()) {
-        CSSFontFaceSrcValue* fontFaceSrcValue = toCSSFontFaceSrcValue(cssValue);
-        if (fontFaceSrcValue->isLocal()) {
+    } else if (cssValue.isFontFaceSrcValue()) {
+        CSSFontFaceSrcValue& fontFaceSrcValue = toCSSFontFaceSrcValue(cssValue);
+        if (fontFaceSrcValue.isLocal()) {
             return;
         }
 
-        addFontToResources(fontFaceSrcValue->fetch(&document));
-    } else if (cssValue->isValueList()) {
-        CSSValueList* cssValueList = toCSSValueList(cssValue);
-        for (unsigned i = 0; i < cssValueList->length(); i++)
-            retrieveResourcesForCSSValue(cssValueList->item(i), document);
+        addFontToResources(fontFaceSrcValue.fetch(&document));
+    } else if (cssValue.isValueList()) {
+        CSSValueList& cssValueList = toCSSValueList(cssValue);
+        for (unsigned i = 0; i < cssValueList.length(); i++)
+            retrieveResourcesForCSSValue(cssValueList.item(i), document);
     }
 }
 
 KURL PageSerializer::urlForBlankFrame(LocalFrame* frame)
 {
     BlankFrameURLMap::iterator iter = m_blankFrameURLs.find(frame);
     if (iter != m_blankFrameURLs.end())
         return iter->value;
     String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
     KURL fakeURL(ParsedURLString, url);
     m_blankFrameURLs.add(frame, fakeURL);
 
     return fakeURL;
 }
 
 PageSerializer::Delegate* PageSerializer::delegate()
 {
     return m_delegate.get();
 }
 
 } // namespace blink