Title: [164310] trunk/Source/WebCore
- Revision
- 164310
- Author
- ddkil...@apple.com
- Date
- 2014-02-18 13:27:03 -0800 (Tue, 18 Feb 2014)
Log Message
Follow-up: Add type-checked casts for StyleImage and subclasses
<http://webkit.org/b/128915>
Address some style issues based on feedback from Andreas Kling.
* css/CSSCursorImageValue.cpp:
(WebCore::CSSCursorImageValue::cachedImageURL):
* css/CSSImageSetValue.cpp:
(WebCore::CSSImageSetValue::~CSSImageSetValue):
(WebCore::CSSImageSetValue::hasFailedOrCanceledSubresources):
* css/CSSImageValue.cpp:
(WebCore::CSSImageValue::hasFailedOrCanceledSubresources):
- Use the reference version of the type-checked casts since we
know the pointers are not NULL.
* rendering/style/StyleImage.h:
- Use 'styleImage' instead of 'resource' in
STYLE_IMAGE_TYPE_CASTS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164309 => 164310)
--- trunk/Source/WebCore/ChangeLog 2014-02-18 21:15:54 UTC (rev 164309)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 21:27:03 UTC (rev 164310)
@@ -1,3 +1,24 @@
+2014-02-18 David Kilzer <ddkil...@apple.com>
+
+ Follow-up: Add type-checked casts for StyleImage and subclasses
+ <http://webkit.org/b/128915>
+
+ Address some style issues based on feedback from Andreas Kling.
+
+ * css/CSSCursorImageValue.cpp:
+ (WebCore::CSSCursorImageValue::cachedImageURL):
+ * css/CSSImageSetValue.cpp:
+ (WebCore::CSSImageSetValue::~CSSImageSetValue):
+ (WebCore::CSSImageSetValue::hasFailedOrCanceledSubresources):
+ * css/CSSImageValue.cpp:
+ (WebCore::CSSImageValue::hasFailedOrCanceledSubresources):
+ - Use the reference version of the type-checked casts since we
+ know the pointers are not NULL.
+
+ * rendering/style/StyleImage.h:
+ - Use 'styleImage' instead of 'resource' in
+ STYLE_IMAGE_TYPE_CASTS.
+
2014-02-18 Zan Dobersek <zdober...@igalia.com>
Remove unnecessary UserActionElementSet constructor, destructor
Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (164309 => 164310)
--- trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2014-02-18 21:15:54 UTC (rev 164309)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2014-02-18 21:27:03 UTC (rev 164310)
@@ -195,7 +195,7 @@
{
if (!m_image || !m_image->isCachedImage())
return String();
- return toStyleCachedImage(m_image.get())->cachedImage()->url();
+ return toStyleCachedImage(*m_image).cachedImage()->url();
}
void CSSCursorImageValue::clearCachedImage()
Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (164309 => 164310)
--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-02-18 21:15:54 UTC (rev 164309)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-02-18 21:27:03 UTC (rev 164310)
@@ -61,7 +61,7 @@
detachPendingImage();
if (m_imageSet && m_imageSet->isCachedImageSet())
- toStyleCachedImageSet(m_imageSet.get())->clearImageSetValue();
+ toStyleCachedImageSet(*m_imageSet).clearImageSetValue();
}
void CSSImageSetValue::fillImageSet()
@@ -191,7 +191,7 @@
{
if (!m_imageSet || !m_imageSet->isCachedImageSet())
return false;
- CachedResource* cachedResource = toStyleCachedImageSet(m_imageSet.get())->cachedImage();
+ CachedResource* cachedResource = toStyleCachedImageSet(*m_imageSet).cachedImage();
if (!cachedResource)
return true;
return cachedResource->loadFailedOrCanceled();
Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (164309 => 164310)
--- trunk/Source/WebCore/css/CSSImageValue.cpp 2014-02-18 21:15:54 UTC (rev 164309)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2014-02-18 21:27:03 UTC (rev 164310)
@@ -105,7 +105,7 @@
{
if (!m_image || !m_image->isCachedImage())
return false;
- CachedResource* cachedResource = toStyleCachedImage(m_image.get())->cachedImage();
+ CachedResource* cachedResource = toStyleCachedImage(*m_image).cachedImage();
if (!cachedResource)
return true;
return cachedResource->loadFailedOrCanceled();
Modified: trunk/Source/WebCore/rendering/style/StyleImage.h (164309 => 164310)
--- trunk/Source/WebCore/rendering/style/StyleImage.h 2014-02-18 21:15:54 UTC (rev 164309)
+++ trunk/Source/WebCore/rendering/style/StyleImage.h 2014-02-18 21:27:03 UTC (rev 164310)
@@ -94,7 +94,7 @@
};
#define STYLE_IMAGE_TYPE_CASTS(ToClassName, FromClassName, predicate) \
- TYPE_CASTS_BASE(ToClassName, FromClassName, resource, resource->predicate(), resource.predicate())
+ TYPE_CASTS_BASE(ToClassName, FromClassName, styleImage, styleImage->predicate(), styleImage.predicate())
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
