Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: sky/engine/core/css/resolver/StyleResourceLoader.cpp

Issue 1214633005: Remove CSS clients of ImageResource (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/resolver/StyleBuilderCustom.cpp ('k') | sky/engine/core/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « sky/engine/core/css/resolver/StyleBuilderCustom.cpp ('k') | sky/engine/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698