| Index: sky/engine/core/css/resolver/ElementStyleResources.cpp
|
| diff --git a/sky/engine/core/css/resolver/ElementStyleResources.cpp b/sky/engine/core/css/resolver/ElementStyleResources.cpp
|
| index 60c00fca677154b1d8d17a87fe458031c093b044..eaeeac187357bcf0e4be6630d22756d51e423c2a 100644
|
| --- a/sky/engine/core/css/resolver/ElementStyleResources.cpp
|
| +++ b/sky/engine/core/css/resolver/ElementStyleResources.cpp
|
| @@ -37,18 +37,12 @@ ElementStyleResources::ElementStyleResources()
|
|
|
| PassRefPtr<StyleImage> ElementStyleResources::styleImage(Document& document, const TextLinkColors& textLinkColors, Color currentColor, CSSPropertyID property, CSSValue* value)
|
| {
|
| - if (value->isImageValue())
|
| - return cachedOrPendingFromValue(document, property, toCSSImageValue(value));
|
| -
|
| if (value->isImageGeneratorValue()) {
|
| if (value->isGradientValue())
|
| return generatedOrPendingFromValue(property, toCSSGradientValue(value)->gradientWithStylesResolved(textLinkColors, currentColor).get());
|
| return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(value));
|
| }
|
|
|
| - if (value->isImageSetValue())
|
| - return setOrPendingFromValue(property, toCSSImageSetValue(value));
|
| -
|
| return nullptr;
|
| }
|
|
|
| @@ -61,26 +55,6 @@ PassRefPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPro
|
| return StyleGeneratedImage::create(value);
|
| }
|
|
|
| -PassRefPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue* value)
|
| -{
|
| - RefPtr<StyleImage> image = value->cachedOrPendingImageSet(m_deviceScaleFactor);
|
| - if (image && image->isPendingImage())
|
| - m_pendingImageProperties.set(property, value);
|
| - return image.release();
|
| -}
|
| -
|
| -PassRefPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, CSSImageValue* value)
|
| -{
|
| - RefPtr<StyleImage> image = value->cachedOrPendingImage();
|
| - if (image) {
|
| - if (image->isPendingImage())
|
| - m_pendingImageProperties.set(property, value);
|
| - else
|
| - value->restoreCachedResourceIfNeeded(document);
|
| - }
|
| - return image.release();
|
| -}
|
| -
|
| void ElementStyleResources::clearPendingImageProperties()
|
| {
|
| m_pendingImageProperties.clear();
|
|
|