<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174836] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174836">174836</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-17 14:12:42 -0700 (Fri, 17 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValuecpp">trunk/Source/WebCore/css/CSSCursorImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValuecpp">trunk/Source/WebCore/css/CSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageh">trunk/Source/WebCore/rendering/style/StyleCachedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageSeth">trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImageh">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleImageh">trunk/Source/WebCore/rendering/style/StyleImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStylePendingImageh">trunk/Source/WebCore/rendering/style/StylePendingImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/ChangeLog 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-10-17 Chris Dumez <cdumez@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-10-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [Media] Always update controls for <audio> since they are always visible
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx">
</span><span class="cx"> inline void CSSCursorImageValue::detachPendingImage()
</span><span class="cx"> {
</span><del>- if (m_image && m_image->isPendingImage())
- toStylePendingImage(*m_image).detachFromCSSValue();
</del><ins>+ if (is<StylePendingImage>(m_image.get()))
+ downcast<StylePendingImage>(*m_image).detachFromCSSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSCursorImageValue::~CSSCursorImageValue()
</span><span class="lines">@@ -160,8 +160,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_image && m_image->isCachedImage())
- return toStyleCachedImage(m_image.get());
</del><ins>+ if (is<StyleCachedImage>(m_image.get()))
+ return downcast<StyleCachedImage>(m_image.get());
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx">
</span><span class="cx"> String CSSCursorImageValue::cachedImageURL()
</span><span class="cx"> {
</span><del>- if (!m_image || !m_image->isCachedImage())
</del><ins>+ if (!is<StyleCachedImage>(m_image.get()))
</ins><span class="cx"> return String();
</span><del>- return toStyleCachedImage(*m_image).cachedImage()->url();
</del><ins>+ return downcast<StyleCachedImage>(*m_image).cachedImage()->url();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSCursorImageValue::clearCachedImage()
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -52,16 +52,16 @@
</span><span class="cx">
</span><span class="cx"> inline void CSSImageSetValue::detachPendingImage()
</span><span class="cx"> {
</span><del>- if (m_imageSet && m_imageSet->isPendingImage())
- toStylePendingImage(*m_imageSet).detachFromCSSValue();
</del><ins>+ if (is<StylePendingImage>(m_imageSet.get()))
+ downcast<StylePendingImage>(*m_imageSet).detachFromCSSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSImageSetValue::~CSSImageSetValue()
</span><span class="cx"> {
</span><span class="cx"> detachPendingImage();
</span><span class="cx">
</span><del>- if (m_imageSet && m_imageSet->isCachedImageSet())
- toStyleCachedImageSet(*m_imageSet).clearImageSetValue();
</del><ins>+ if (is<StyleCachedImageSet>(m_imageSet.get()))
+ downcast<StyleCachedImageSet>(*m_imageSet).clearImageSetValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSImageSetValue::fillImageSet()
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return (m_imageSet && m_imageSet->isCachedImageSet()) ? toStyleCachedImageSet(m_imageSet.get()) : nullptr;
</del><ins>+ return is<StyleCachedImageSet>(m_imageSet.get()) ? downcast<StyleCachedImageSet>(m_imageSet.get()) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
</span><span class="lines">@@ -188,9 +188,9 @@
</span><span class="cx">
</span><span class="cx"> bool CSSImageSetValue::hasFailedOrCanceledSubresources() const
</span><span class="cx"> {
</span><del>- if (!m_imageSet || !m_imageSet->isCachedImageSet())
</del><ins>+ if (!is<StyleCachedImageSet>(m_imageSet.get()))
</ins><span class="cx"> return false;
</span><del>- CachedResource* cachedResource = toStyleCachedImageSet(*m_imageSet).cachedImage();
</del><ins>+ CachedImage* cachedResource = downcast<StyleCachedImageSet>(*m_imageSet).cachedImage();
</ins><span class="cx"> if (!cachedResource)
</span><span class="cx"> return true;
</span><span class="cx"> return cachedResource->loadFailedOrCanceled();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">
</span><span class="cx"> inline void CSSImageValue::detachPendingImage()
</span><span class="cx"> {
</span><del>- if (m_image && m_image->isPendingImage())
- toStylePendingImage(*m_image).detachFromCSSValue();
</del><ins>+ if (is<StylePendingImage>(m_image.get()))
+ downcast<StylePendingImage>(*m_image).detachFromCSSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSImageValue::~CSSImageValue()
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return (m_image && m_image->isCachedImage()) ? toStyleCachedImage(m_image.get()) : nullptr;
</del><ins>+ return is<StyleCachedImage>(m_image.get()) ? downcast<StyleCachedImage>(m_image.get()) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader)
</span><span class="lines">@@ -103,9 +103,9 @@
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::hasFailedOrCanceledSubresources() const
</span><span class="cx"> {
</span><del>- if (!m_image || !m_image->isCachedImage())
</del><ins>+ if (!is<StyleCachedImage>(m_image.get()))
</ins><span class="cx"> return false;
</span><del>- CachedResource* cachedResource = toStyleCachedImage(*m_image).cachedImage();
</del><ins>+ CachedResource* cachedResource = downcast<StyleCachedImage>(*m_image).cachedImage();
</ins><span class="cx"> if (!cachedResource)
</span><span class="cx"> return true;
</span><span class="cx"> return cachedResource->loadFailedOrCanceled();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -3680,10 +3680,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StyleImage* image = shapeValue->image();
</span><del>- if (!image || !image->isPendingImage())
</del><ins>+ if (!is<StylePendingImage>(image))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& pendingImage = toStylePendingImage(*image);
</del><ins>+ auto& pendingImage = downcast<StylePendingImage>(*image);
</ins><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><span class="cx"> options.setRequestOriginPolicy(PotentiallyCrossOriginEnabled);
</span><span class="lines">@@ -3705,9 +3705,9 @@
</span><span class="cx"> switch (currentProperty) {
</span><span class="cx"> case CSSPropertyBackgroundImage: {
</span><span class="cx"> for (FillLayer* backgroundLayer = m_state.style()->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
</span><del>- auto styleImage = backgroundLayer->image();
- if (styleImage && styleImage->isPendingImage())
- backgroundLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = backgroundLayer->image();
+ if (is<StylePendingImage>(styleImage))
+ backgroundLayer->setImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3715,9 +3715,8 @@
</span><span class="cx"> for (ContentData* contentData = const_cast<ContentData*>(m_state.style()->contentData()); contentData; contentData = contentData->next()) {
</span><span class="cx"> if (is<ImageContentData>(*contentData)) {
</span><span class="cx"> auto& styleImage = downcast<ImageContentData>(*contentData).image();
</span><del>- if (styleImage.isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(styleImage));
- if (loadedImage)
</del><ins>+ if (is<StylePendingImage>(styleImage)) {
+ if (RefPtr<StyleImage> loadedImage = loadPendingImage(downcast<StylePendingImage>(styleImage)))
</ins><span class="cx"> downcast<ImageContentData>(*contentData).setImage(loadedImage.release());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3728,47 +3727,47 @@
</span><span class="cx"> if (CursorList* cursorList = m_state.style()->cursors()) {
</span><span class="cx"> for (size_t i = 0; i < cursorList->size(); ++i) {
</span><span class="cx"> CursorData& currentCursor = cursorList->at(i);
</span><del>- auto styleImage = currentCursor.image();
- if (styleImage && styleImage->isPendingImage())
- currentCursor.setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = currentCursor.image();
+ if (is<StylePendingImage>(styleImage))
+ currentCursor.setImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyListStyleImage: {
</span><del>- auto styleImage = m_state.style()->listStyleImage();
- if (styleImage && styleImage->isPendingImage())
- m_state.style()->setListStyleImage(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = m_state.style()->listStyleImage();
+ if (is<StylePendingImage>(styleImage))
+ m_state.style()->setListStyleImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyBorderImageSource: {
</span><del>- auto styleImage = m_state.style()->borderImageSource();
- if (styleImage && styleImage->isPendingImage())
- m_state.style()->setBorderImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = m_state.style()->borderImageSource();
+ if (is<StylePendingImage>(styleImage))
+ m_state.style()->setBorderImageSource(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitBoxReflect: {
</span><span class="cx"> if (StyleReflection* reflection = m_state.style()->boxReflect()) {
</span><span class="cx"> const NinePieceImage& maskImage = reflection->mask();
</span><del>- auto styleImage = maskImage.image();
- if (styleImage && styleImage->isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(*styleImage));
</del><ins>+ auto* styleImage = maskImage.image();
+ if (is<StylePendingImage>(styleImage)) {
+ RefPtr<StyleImage> loadedImage = loadPendingImage(downcast<StylePendingImage>(*styleImage));
</ins><span class="cx"> reflection->setMask(NinePieceImage(loadedImage.release(), maskImage.imageSlices(), maskImage.fill(), maskImage.borderSlices(), maskImage.outset(), maskImage.horizontalRule(), maskImage.verticalRule()));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitMaskBoxImageSource: {
</span><del>- auto styleImage = m_state.style()->maskBoxImageSource();
- if (styleImage && styleImage->isPendingImage())
- m_state.style()->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = m_state.style()->maskBoxImageSource();
+ if (is<StylePendingImage>(styleImage))
+ m_state.style()->setMaskBoxImageSource(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitMaskImage: {
</span><span class="cx"> for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><del>- auto styleImage = maskLayer->image();
- if (styleImage && styleImage->isPendingImage())
- maskLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</del><ins>+ auto* styleImage = maskLayer->image();
+ if (is<StylePendingImage>(styleImage))
+ maskLayer->setImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -333,13 +333,13 @@
</span><span class="cx">
</span><span class="cx"> StyleImage* styleImage = downcast<CSSImageValue>(*cssValue).cachedOrPendingImage();
</span><span class="cx"> // Non cached-images are just place-holders and do not contain data.
</span><del>- if (!styleImage || !styleImage->isCachedImage())
</del><ins>+ if (!is<StyleCachedImage>(styleImage))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- CachedImage* image = toStyleCachedImage(styleImage)->cachedImage();
</del><ins>+ CachedImage* image = downcast<StyleCachedImage>(*styleImage).cachedImage();
</ins><span class="cx">
</span><span class="cx"> URL url = document->completeURL(image->url());
</span><del>- addImageToResources(image, 0, url);
</del><ins>+ addImageToResources(image, nullptr, url);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -293,9 +293,9 @@
</span><span class="cx"> return to;
</span><span class="cx">
</span><span class="cx"> // Animation between two generated images. Cross fade for all other cases.
</span><del>- if (from->isGeneratedImage() && to->isGeneratedImage()) {
- CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
- CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
</del><ins>+ if (is<StyleGeneratedImage>(*from) && is<StyleGeneratedImage>(*to)) {
+ CSSImageGeneratorValue& fromGenerated = downcast<StyleGeneratedImage>(*from).imageValue();
+ CSSImageGeneratorValue& toGenerated = downcast<StyleGeneratedImage>(*to).imageValue();
</ins><span class="cx">
</span><span class="cx"> if (is<CSSFilterImageValue>(fromGenerated) && is<CSSFilterImageValue>(toGenerated)) {
</span><span class="cx"> // Animation of generated images just possible if input images are equal.
</span><span class="lines">@@ -315,19 +315,19 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for animation between two *gradient() functions.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=119956
</span><del>- } else if (from->isGeneratedImage() && to->isCachedImage()) {
- CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
</del><ins>+ } else if (is<StyleGeneratedImage>(*from) && is<StyleCachedImage>(*to)) {
+ CSSImageGeneratorValue& fromGenerated = downcast<StyleGeneratedImage>(*from).imageValue();
</ins><span class="cx"> if (is<CSSFilterImageValue>(fromGenerated)) {
</span><span class="cx"> CSSFilterImageValue& fromFilter = downcast<CSSFilterImageValue>(fromGenerated);
</span><del>- if (fromFilter.cachedImage() && toStyleCachedImage(to)->cachedImage() == fromFilter.cachedImage())
</del><ins>+ if (fromFilter.cachedImage() && downcast<StyleCachedImage>(*to).cachedImage() == fromFilter.cachedImage())
</ins><span class="cx"> return blendFilter(anim, fromFilter.cachedImage(), fromFilter.filterOperations(), FilterOperations(), progress);
</span><span class="cx"> }
</span><span class="cx"> // FIXME: Add interpolation between cross-fade and image source.
</span><del>- } else if (from->isCachedImage() && to->isGeneratedImage()) {
- CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
</del><ins>+ } else if (is<StyleCachedImage>(*from) && is<StyleGeneratedImage>(*to)) {
+ CSSImageGeneratorValue& toGenerated = downcast<StyleGeneratedImage>(*to).imageValue();
</ins><span class="cx"> if (is<CSSFilterImageValue>(toGenerated)) {
</span><span class="cx"> CSSFilterImageValue& toFilter = downcast<CSSFilterImageValue>(toGenerated);
</span><del>- if (toFilter.cachedImage() && toStyleCachedImage(from)->cachedImage() == toFilter.cachedImage())
</del><ins>+ if (toFilter.cachedImage() && downcast<StyleCachedImage>(*from).cachedImage() == toFilter.cachedImage())
</ins><span class="cx"> return blendFilter(anim, toFilter.cachedImage(), FilterOperations(), toFilter.filterOperations(), progress);
</span><span class="cx"> }
</span><span class="cx"> // FIXME: Add interpolation between image source and cross-fade.
</span><span class="lines">@@ -335,8 +335,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support cross fade between cached and generated images.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=78293
</span><del>- if (from->isCachedImage() && to->isCachedImage())
- return crossfadeBlend(anim, toStyleCachedImage(from), toStyleCachedImage(to), progress);
</del><ins>+ if (is<StyleCachedImage>(*from) && is<StyleCachedImage>(*to))
+ return crossfadeBlend(anim, downcast<StyleCachedImage>(from), downcast<StyleCachedImage>(to), progress);
</ins><span class="cx">
</span><span class="cx"> return to;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.h (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -64,7 +64,8 @@
</span><span class="cx"> CachedResourceHandle<CachedImage> m_image;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-STYLE_IMAGE_TYPE_CASTS(StyleCachedImage, StyleImage, isCachedImage)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(StyleCachedImage, isCachedImage)
+
+#endif // StyleCachedImage_h
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -83,10 +83,10 @@
</span><span class="cx"> CSSImageSetValue* m_imageSetValue; // Not retained; it owns us.
</span><span class="cx"> };
</span><span class="cx">
</span><del>-STYLE_IMAGE_TYPE_CASTS(StyleCachedImageSet, StyleImage, isCachedImageSet)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(StyleCachedImageSet, isCachedImageSet)
+
</ins><span class="cx"> #endif // ENABLE(CSS_IMAGE_SET)
</span><span class="cx">
</span><span class="cx"> #endif // StyleCachedImageSet_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -63,7 +63,8 @@
</span><span class="cx"> bool m_fixedSize;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-STYLE_IMAGE_TYPE_CASTS(StyleGeneratedImage, StyleImage, isGeneratedImage)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(StyleGeneratedImage, isGeneratedImage)
+
+#endif // StyleGeneratedImage_h
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleImage.h (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleImage.h 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/rendering/style/StyleImage.h 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -92,8 +93,11 @@
</span><span class="cx"> bool m_isCachedImageSet : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define STYLE_IMAGE_TYPE_CASTS(ToClassName, FromClassName, predicate) \
- TYPE_CASTS_BASE(ToClassName, FromClassName, styleImage, styleImage->predicate(), styleImage.predicate())
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
-#endif
</del><ins>+#define SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(ToClassName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToClassName) \
+ static bool isType(const WebCore::StyleImage& image) { return image.predicate(); } \
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // StyleImage_h
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStylePendingImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StylePendingImage.h (174835 => 174836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StylePendingImage.h 2014-10-17 21:06:21 UTC (rev 174835)
+++ trunk/Source/WebCore/rendering/style/StylePendingImage.h 2014-10-17 21:12:42 UTC (rev 174836)
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> CSSValue* m_value; // Not retained; it owns us.
</span><span class="cx"> };
</span><span class="cx">
</span><del>-STYLE_IMAGE_TYPE_CASTS(StylePendingImage, StyleImage, isPendingImage)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
</del><ins>+SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(StylePendingImage, isPendingImage)
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#endif // StylePendingImage_h
</ins></span></pre>
</div>
</div>
</body>
</html>