diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebCore/css/CSSImageSetValue.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebCore/css/CSSImageSetValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSImageSetValue.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSImageSetValue.cpp b/Source/WebCore/css/CSSImageSetValue.cpp index 0f48d010a..c3163f55c 100644 --- a/Source/WebCore/css/CSSImageSetValue.cpp +++ b/Source/WebCore/css/CSSImageSetValue.cpp @@ -30,8 +30,10 @@ #include "CSSImageValue.h" #include "CSSPrimitiveValue.h" +#include "CachedImage.h" #include "CachedResourceLoader.h" #include "Document.h" +#include "MemoryInstrumentation.h" #include "Page.h" #include "StyleCachedImageSet.h" #include "StylePendingImage.h" @@ -139,6 +141,16 @@ String CSSImageSetValue::customCssText() const return "-webkit-image-set(" + CSSValueList::customCssText() + ")"; } +bool CSSImageSetValue::hasFailedOrCanceledSubresources() const +{ + if (!m_imageSet || !m_imageSet->isCachedImageSet()) + return false; + CachedResource* cachedResource = static_cast<StyleCachedImageSet*>(m_imageSet.get())->cachedImage(); + if (!cachedResource) + return true; + return cachedResource->loadFailedOrCanceled(); +} + CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom) : CSSValueList(cloneFrom) , m_accessedBestFitImage(false) @@ -152,6 +164,19 @@ PassRefPtr<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const return adoptRef(new CSSImageSetValue(*this)); } +void CSSImageSetValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +{ + MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo); + info.addInstrumentedVector(m_imagesInSet); +} + +void CSSImageSetValue::ImageWithScale::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +{ + MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + info.addMember(imageURL); +} + } // namespace WebCore #endif // ENABLE(CSS_IMAGE_SET) |