| Index: sky/engine/core/css/resolver/StyleResourceLoader.cpp
|
| diff --git a/sky/engine/core/css/resolver/StyleResourceLoader.cpp b/sky/engine/core/css/resolver/StyleResourceLoader.cpp
|
| index e6940322e2621278f602b9d824a95e239092bc28..beb166088fa1da96f6cda9d1e7617d71e4405d2d 100644
|
| --- a/sky/engine/core/css/resolver/StyleResourceLoader.cpp
|
| +++ b/sky/engine/core/css/resolver/StyleResourceLoader.cpp
|
| @@ -23,13 +23,10 @@
|
| #include "sky/engine/core/css/resolver/StyleResourceLoader.h"
|
|
|
| #include "gen/sky/core/CSSPropertyNames.h"
|
| -#include "sky/engine/core/css/CSSImageValue.h"
|
| #include "sky/engine/core/css/resolver/ElementStyleResources.h"
|
| #include "sky/engine/core/fetch/ResourceFetcher.h"
|
| #include "sky/engine/core/rendering/style/FillLayer.h"
|
| #include "sky/engine/core/rendering/style/RenderStyle.h"
|
| -#include "sky/engine/core/rendering/style/StyleFetchedImage.h"
|
| -#include "sky/engine/core/rendering/style/StyleFetchedImageSet.h"
|
| #include "sky/engine/core/rendering/style/StyleGeneratedImage.h"
|
| #include "sky/engine/core/rendering/style/StylePendingImage.h"
|
|
|
| @@ -42,18 +39,11 @@ StyleResourceLoader::StyleResourceLoader(ResourceFetcher* fetcher)
|
|
|
| PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor)
|
| {
|
| - if (CSSImageValue* imageValue = pendingImage->cssImageValue())
|
| - return imageValue->cachedImage(m_fetcher, ResourceFetcher::defaultResourceOptions());
|
| -
|
| - if (CSSImageGeneratorValue* imageGeneratorValue
|
| - = pendingImage->cssImageGeneratorValue()) {
|
| + if (CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
|
| imageGeneratorValue->loadSubimages(m_fetcher);
|
| return StyleGeneratedImage::create(imageGeneratorValue);
|
| }
|
|
|
| - if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
|
| - return imageSetValue->cachedImageSet(m_fetcher, deviceScaleFactor, ResourceFetcher::defaultResourceOptions());
|
| -
|
| return nullptr;
|
| }
|
|
|
|
|