<!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>[174623] trunk/Source</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/174623">174623</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-10 16:32:45 -0700 (Fri, 10 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for Image subclasses
https://bugs.webkit.org/show_bug.cgi?id=137625
Reviewed by Andreas Kling.
Use is<>() / downcast<>() for Image subclasses.
Source/WebCore:
No new tests, no behavior change.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::remoteSVGRootElement):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::imageSizeForRenderer):
(WebCore::CachedImage::createImage):
* platform/graphics/BitmapImage.h:
* platform/graphics/Image.h:
* platform/mac/DragImageMac.mm:
(WebCore::createDragImageFromImage):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::embeddedContentBox):
* svg/graphics/SVGImage.h:
Source/WebKit2:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::pluginSnapshotTimerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageh">trunk/Source/WebCore/svg/graphics/SVGImage.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/ChangeLog 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-10-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for Image subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137625
+
+ Reviewed by Andreas Kling.
+
+ Use is<>() / downcast<>() for Image subclasses.
+
+ No new tests, no behavior change.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::remoteSVGRootElement):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::imageSizeForRenderer):
+ (WebCore::CachedImage::createImage):
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/Image.h:
+ * platform/mac/DragImageMac.mm:
+ (WebCore::createDragImageFromImage):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::embeddedContentBox):
+ * svg/graphics/SVGImage.h:
+
+2014-10-10 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for RenderElement
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137622
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -2867,11 +2867,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> Image* image = cachedImage->image();
</span><del>- if (!image || !image->isSVGImage())
</del><ins>+ if (!is<SVGImage>(image))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- SVGImage* svgImage = static_cast<SVGImage*>(image);
- FrameView* frameView = svgImage->frameView();
</del><ins>+ FrameView* frameView = downcast<SVGImage>(*image).frameView();
</ins><span class="cx"> if (!frameView)
</span><span class="cx"> return nullptr;
</span><span class="cx"> Frame& frame = frameView->frame();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -271,17 +271,17 @@
</span><span class="cx"> LayoutSize imageSize(m_image->size());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><del>- if (renderer && m_image->isBitmapImage()) {
</del><ins>+ if (renderer && is<BitmapImage>(*m_image)) {
</ins><span class="cx"> ImageOrientationDescription orientationDescription(renderer->shouldRespectImageOrientation(), renderer->style().imageOrientation());
</span><span class="cx"> if (orientationDescription.respectImageOrientation() == RespectImageOrientation)
</span><del>- imageSize = LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation(orientationDescription));
</del><ins>+ imageSize = LayoutSize(downcast<BitmapImage>(*m_image).sizeRespectingOrientation(orientationDescription));
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><del>- if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
- imageSize = LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation());
</del><ins>+ if (is<BitmapImage>(*m_image) && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
+ imageSize = LayoutSize(downcast<BitmapImage>(*m_image).sizeRespectingOrientation());
</ins><span class="cx"> #endif // ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx">
</span><del>- else if (m_image->isSVGImage() && sizeType == UsedSize) {
</del><ins>+ else if (is<SVGImage>(*m_image) && sizeType == UsedSize) {
</ins><span class="cx"> imageSize = LayoutSize(m_svgImageCache->imageSizeForRenderer(renderer));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> m_image = svgImage.release();
</span><span class="cx"> } else {
</span><span class="cx"> m_image = BitmapImage::create(this);
</span><del>- toBitmapImage(m_image.get())->setAllowSubsampling(m_loader && m_loader->frameLoader()->frame().settings().imageSubsamplingEnabled());
</del><ins>+ downcast<BitmapImage>(*m_image).setAllowSubsampling(m_loader && m_loader->frameLoader()->frame().settings().imageSubsamplingEnabled());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_image) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -335,8 +335,8 @@
</span><span class="cx"> RefPtr<Image> m_cachedImage;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-IMAGE_TYPE_CASTS(BitmapImage)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
</del><ins>+SPECIALIZE_TYPE_TRAITS_IMAGE(BitmapImage)
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#endif // BitmapImage_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.h 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -202,9 +203,11 @@
</span><span class="cx"> FloatSize m_space;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define IMAGE_TYPE_CASTS(ToClassName) \
- TYPE_CASTS_BASE(ToClassName, Image, image, image->is##ToClassName(), image.is##ToClassName())
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
</del><ins>+#define SPECIALIZE_TYPE_TRAITS_IMAGE(ToClassName) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToClassName) \
+ static bool isType(const WebCore::Image& image) { return image.is##ToClassName(); } \
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#endif // Image_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -84,13 +84,13 @@
</span><span class="cx"> {
</span><span class="cx"> FloatSize size = image->size();
</span><span class="cx">
</span><del>- if (image->isBitmapImage()) {
</del><ins>+ if (is<BitmapImage>(*image)) {
</ins><span class="cx"> ImageOrientation orientation;
</span><del>- BitmapImage* bitmapImage = toBitmapImage(image);
- IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation(description);
</del><ins>+ BitmapImage& bitmapImage = downcast<BitmapImage>(*image);
+ IntSize sizeRespectingOrientation = bitmapImage.sizeRespectingOrientation(description);
</ins><span class="cx">
</span><span class="cx"> if (description.respectImageOrientation() == RespectImageOrientation)
</span><del>- orientation = bitmapImage->orientationForCurrentFrame();
</del><ins>+ orientation = bitmapImage.orientationForCurrentFrame();
</ins><span class="cx">
</span><span class="cx"> if (orientation != DefaultImageOrientation) {
</span><span class="cx"> // Construct a correctly-rotated copy of the image to use as the drag image.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -750,10 +750,10 @@
</span><span class="cx"> RenderBox* RenderImage::embeddedContentBox() const
</span><span class="cx"> {
</span><span class="cx"> CachedImage* cachedImage = imageResource().cachedImage();
</span><del>- if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage())
- return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox();
</del><ins>+ if (cachedImage && is<SVGImage>(cachedImage->image()))
+ return downcast<SVGImage>(*cachedImage->image()).embeddedContentBox();
</ins><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx">
</span><span class="cx"> bool isInSVGImage(const Element*);
</span><span class="cx">
</span><del>-IMAGE_TYPE_CASTS(SVGImage)
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-}
</del><ins>+SPECIALIZE_TYPE_TRAITS_IMAGE(SVGImage)
</ins><span class="cx">
</span><span class="cx"> #endif // SVGImage_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-10-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for Image subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137625
+
+ Reviewed by Andreas Kling.
+
+ Use is<>() / downcast<>() for Image subclasses.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::pluginSnapshotTimerFired):
+
+2014-10-10 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for GraphicsLayer subclasses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137595
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (174622 => 174623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-10-10 23:29:52 UTC (rev 174622)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-10-10 23:32:45 UTC (rev 174623)
</span><span class="lines">@@ -1729,7 +1729,7 @@
</span><span class="cx">
</span><span class="cx"> if (snapshotImage) {
</span><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><del>- bool snapshotIsAlmostSolidColor = isAlmostSolidColor(toBitmapImage(snapshotImage.get()));
</del><ins>+ bool snapshotIsAlmostSolidColor = isAlmostSolidColor(downcast<BitmapImage>(snapshotImage.get()));
</ins><span class="cx"> snapshotFound = !snapshotIsAlmostSolidColor;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>