| Index: Source/core/page/PageSerializer.cpp
|
| diff --git a/Source/core/page/PageSerializer.cpp b/Source/core/page/PageSerializer.cpp
|
| index f213024e85b45d6a60a00f0925a4b7920091a076..4e99747b7f7067a32b87102bd64178aadeab65ff 100644
|
| --- a/Source/core/page/PageSerializer.cpp
|
| +++ b/Source/core/page/PageSerializer.cpp
|
| @@ -383,32 +383,32 @@ void PageSerializer::retrieveResourcesForProperties(const StylePropertySet* styl
|
| // 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);
|
| }
|
| }
|
|
|
|
|