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

Unified Diff: sky/engine/core/css/resolver/ElementStyleResources.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
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();
« no previous file with comments | « sky/engine/core/css/resolver/ElementStyleResources.h ('k') | sky/engine/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698