Changeset 174836 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Oct 17, 2014, 2:12:42 PM (11 years ago)

Author:

Chris Dumez

Message:

Use is<>() / downcast<>() for StyleImage
​https://bugs.webkit.org/show_bug.cgi?id=137824

Reviewed by Andreas Kling.

Use is<>() / downcast<>() for StyleImage and clean up the surrouding
code.

No new tests, no behavior change.

• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::detachPendingImage):
(WebCore::CSSCursorImageValue::cachedImage):
(WebCore::CSSCursorImageValue::cachedImageURL):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::detachPendingImage):
(WebCore::CSSImageSetValue::~CSSImageSetValue):
(WebCore::CSSImageSetValue::cachedImageSet):
(WebCore::CSSImageSetValue::hasFailedOrCanceledSubresources):

• css/CSSImageValue.cpp:

(WebCore::CSSImageValue::detachPendingImage):
(WebCore::CSSImageValue::cachedImage):
(WebCore::CSSImageValue::hasFailedOrCanceledSubresources):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::loadPendingShapeImage):
(WebCore::StyleResolver::loadPendingImages):

• page/PageSerializer.cpp:

(WebCore::PageSerializer::retrieveResourcesForProperties):

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

• rendering/style/StyleCachedImage.h:
• rendering/style/StyleCachedImageSet.h:
• rendering/style/StyleGeneratedImage.h:
• rendering/style/StyleImage.h:
• rendering/style/StylePendingImage.h:

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -53 +53 @@
 inline void CSSImageSetValue::detachPendingImage()
 {
-    if (m_imageSet && m_imageSet->isPendingImage())
-        toStylePendingImage(*m_imageSet).detachFromCSSValue();
+    if (is<StylePendingImage>(m_imageSet.get()))
+        downcast<StylePendingImage>(*m_imageSet).detachFromCSSValue();
 }
 
@@ -61 +61 @@
     detachPendingImage();
 
-    if (m_imageSet && m_imageSet->isCachedImageSet())
-        toStyleCachedImageSet(*m_imageSet).clearImageSetValue();
+    if (is<StyleCachedImageSet>(m_imageSet.get()))
+        downcast<StyleCachedImageSet>(*m_imageSet).clearImageSetValue();
 }
 
@@ -130 +130 @@
     }
 
-    return (m_imageSet && m_imageSet->isCachedImageSet()) ? toStyleCachedImageSet(m_imageSet.get()) : nullptr;
+    return is<StyleCachedImageSet>(m_imageSet.get()) ? downcast<StyleCachedImageSet>(m_imageSet.get()) : nullptr;
 }
 
@@ -189 +189 @@
 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const
 {
-    if (!m_imageSet || !m_imageSet->isCachedImageSet())
+    if (!is<StyleCachedImageSet>(m_imageSet.get()))
         return false;
-    CachedResource* cachedResource = toStyleCachedImageSet(*m_imageSet).cachedImage();
+    CachedImage* cachedResource = downcast<StyleCachedImageSet>(*m_imageSet).cachedImage();
     if (!cachedResource)
         return true;