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

Unified Diff: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

Issue 1368613002: Replace RawPtr with RefPtr on StylePendingImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix image set caching logic Created 5 years, 3 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: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
index 4b6ba321da54dcf7230009dabaeb9c6e77e76609..60be1fbd5c5204191fa171bb6120d1ffa80db9e1 100644
--- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
@@ -57,7 +57,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::styleImage(Document& d
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue* value)
{
if (value->isPending()) {
- m_pendingImageProperties.set(property, value);
+ m_pendingImageProperties.add(property);
return StylePendingImage::create(value);
}
return StyleGeneratedImage::create(value);
@@ -65,30 +65,30 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFrom
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue* value)
{
- RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImageSet(m_deviceScaleFactor);
- if (image && image->isPendingImage())
- m_pendingImageProperties.set(property, value);
- return image.release();
+ if (value->isCachePending(m_deviceScaleFactor)) {
+ m_pendingImageProperties.add(property);
+ return StylePendingImage::create(value);
+ }
+ return value->cachedImageSet(m_deviceScaleFactor);
}
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, CSSImageValue* value)
{
- RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage();
- if (image) {
- if (image->isPendingImage())
- m_pendingImageProperties.set(property, value);
- else
- value->restoreCachedResourceIfNeeded(document);
+ if (value->isCachePending()) {
+ m_pendingImageProperties.add(property);
+ return StylePendingImage::create(value);
}
- return image.release();
+ value->restoreCachedResourceIfNeeded(document);
+ return value->cachedImage();
}
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue* value)
{
- RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage(m_deviceScaleFactor);
- if (image && image->isPendingImage())
- m_pendingImageProperties.set(property, value);
- return image.release();
+ if (value->isCachePending(m_deviceScaleFactor)) {
+ m_pendingImageProperties.add(property);
+ return StylePendingImage::create(value);
+ }
+ return value->cachedImage(m_deviceScaleFactor);
}
void ElementStyleResources::clearPendingImageProperties()

Powered by Google App Engine
This is Rietveld 408576698