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

Timestamp:

Feb 18, 2014, 11:10:38 AM (11 years ago)

Author:

[email protected]

Message:

Add type-checked casts for StyleImage and subclasses
<​http://webkit.org/b/128915>

Reviewed by Oliver Hunt.

• 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):

• Switch from static_cast<>() operators to toTypeName() methods.
• Replace 0 with nullptr where convenient.

• rendering/style/StyleCachedImage.h:
• rendering/style/StyleCachedImageSet.h:
• rendering/style/StyleGeneratedImage.h:
• rendering/style/StyleImage.h:
• rendering/style/StylePendingImage.h:
• Define type-checked cast macros.

File:

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

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -54 +54 @@
 {
     if (m_imageSet && m_imageSet->isPendingImage())
-        static_cast<StylePendingImage&>(*m_imageSet).detachFromCSSValue();
+        toStylePendingImage(*m_imageSet).detachFromCSSValue();
 }
 
@@ -62 +62 @@
 
     if (m_imageSet && m_imageSet->isCachedImageSet())
-        static_cast<StyleCachedImageSet*>(m_imageSet.get())->clearImageSetValue();
+        toStyleCachedImageSet(m_imageSet.get())->clearImageSetValue();
 }
 
@@ -131 +131 @@
     }
 
-    return (m_imageSet && m_imageSet->isCachedImageSet()) ? static_cast<StyleCachedImageSet*>(m_imageSet.get()) : 0;
+    return (m_imageSet && m_imageSet->isCachedImageSet()) ? toStyleCachedImageSet(m_imageSet.get()) : nullptr;
 }
 
@@ -192 +192 @@
     if (!m_imageSet || !m_imageSet->isCachedImageSet())
         return false;
-    CachedResource* cachedResource = static_cast<StyleCachedImageSet*>(m_imageSet.get())->cachedImage();
+    CachedResource* cachedResource = toStyleCachedImageSet(m_imageSet.get())->cachedImage();
     if (!cachedResource)
         return true;