<!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>[163148] 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/163148">163148</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 18:02:05 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add security-checked cast for WebCore::CachedImage
<http://webkit.org/b/127967>
Reviewed by Darin Adler.
Source/WebCore:
* loader/cache/CachedImage.h:
(WebCore::toCachedImage): Add.
(WebCore::toCachedImageManual): Add.
* loader/cache/CachedResource.h:
(CACHED_RESOURCE_TYPE_CASTS): Add macro.
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::switchClientsToRevalidatedResource):
(WebCore::CachedImage::resumeAnimatingImagesForLoader):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestImage):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::removeImageFromCache):
- Use toCachedImage() and toCachedImageManual().
Source/WebKit/mac:
* Misc/WebCache.mm:
(+[WebCache imageForURL:]):
- Use WebCore::toCachedImage().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-30 David Kilzer <ddkilzer@apple.com>
+
+ Add security-checked cast for WebCore::CachedImage
+ <http://webkit.org/b/127967>
+
+ Reviewed by Darin Adler.
+
+ * loader/cache/CachedImage.h:
+ (WebCore::toCachedImage): Add.
+ (WebCore::toCachedImageManual): Add.
+ * loader/cache/CachedResource.h:
+ (CACHED_RESOURCE_TYPE_CASTS): Add macro.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::switchClientsToRevalidatedResource):
+ (WebCore::CachedImage::resumeAnimatingImagesForLoader):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestImage):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::removeImageFromCache):
+ - Use toCachedImage() and toCachedImageManual().
+
</ins><span class="cx"> 2014-01-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed position objects are clipped in iOS WK2
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
</span><span class="cx"> switchContainerSizeRequests.set(it->key, it->value);
</span><span class="cx"> CachedResource::switchClientsToRevalidatedResource();
</span><del>- CachedImage* revalidatedCachedImage = static_cast<CachedImage*>(resourceToRevalidate());
</del><ins>+ CachedImage* revalidatedCachedImage = toCachedImage(resourceToRevalidate());
</ins><span class="cx"> for (ContainerSizeRequests::iterator it = switchContainerSizeRequests.begin(); it != switchContainerSizeRequests.end(); ++it)
</span><span class="cx"> revalidatedCachedImage->setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
</span><span class="cx"> return;
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> const CachedResourceHandle<CachedResource>& resource = it->value;
</span><span class="cx"> if (!resource || !resource->isImage())
</span><span class="cx"> continue;
</span><del>- CachedImage* cachedImage = static_cast<CachedImage*>(resource.get());
</del><ins>+ CachedImage* cachedImage = toCachedImage(resource.get());
</ins><span class="cx"> if (!cachedImage->hasImage())
</span><span class="cx"> continue;
</span><span class="cx"> Image* image = cachedImage->image();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -161,6 +161,11 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedImage, CachedResource, CachedResource::ImageResource)
+#if USE(CF)
+TYPE_CASTS_BASE(CachedImageManual, CachedImage, resource, resource->isManual(), resource.isManual())
+#endif
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -368,6 +368,9 @@
</span><span class="cx"> HashSet<CachedResourceHandleBase*> m_handlesToRevalidate;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define CACHED_RESOURCE_TYPE_CASTS(ToClassName, FromClassName, CachedResourceType) \
+ TYPE_CASTS_BASE(ToClassName, FromClassName, resource, resource->type() == CachedResourceType, resource.type() == CachedResourceType)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> request.setDefer(clientDefersImage(request.resourceRequest().url()) ? CachedResourceRequest::DeferredByClient : CachedResourceRequest::NoDefer);
</span><del>- return static_cast<CachedImage*>(requestResource(CachedResource::ImageResource, request).get());
</del><ins>+ return toCachedImage(requestResource(CachedResource::ImageResource, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedFont> CachedResourceLoader::requestFont(CachedResourceRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // A resource exists and is not a manually cached image, so just remove it.
</span><del>- if (!resource->isImage() || !static_cast<CachedImage*>(resource)->isManual()) {
</del><ins>+ if (!resource->isImage() || !toCachedImage(resource)->isManual()) {
</ins><span class="cx"> evict(resource);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> // dead resources are pruned. That might be immediately since
</span><span class="cx"> // removing the last client triggers a MemoryCache::prune, so the
</span><span class="cx"> // resource may be deleted after this call.
</span><del>- static_cast<CachedImageManual*>(resource)->removeFakeClient();
</del><ins>+ toCachedImageManual(toCachedImage(resource))->removeFakeClient();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-01-30 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Add security-checked cast for WebCore::CachedImage
+ <http://webkit.org/b/127967>
+
+ Reviewed by Darin Adler.
+
+ * Misc/WebCache.mm:
+ (+[WebCache imageForURL:]):
+ - Use WebCore::toCachedImage().
+
+2014-01-30 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> De-virtual-ize CachedResource::isImage()
</span><span class="cx"> <http://webkit.org/b/127936>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (163147 => 163148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-01-31 01:53:19 UTC (rev 163147)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-01-31 02:02:05 UTC (rev 163148)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> WebCore::CachedResource* cachedResource = WebCore::memoryCache()->resourceForURL(url);
</span><span class="cx"> if (!cachedResource || !cachedResource->isImage())
</span><span class="cx"> return nullptr;
</span><del>- WebCore::CachedImage* cachedImage = static_cast<WebCore::CachedImage*>(cachedResource);
</del><ins>+ WebCore::CachedImage* cachedImage = WebCore::toCachedImage(cachedResource);
</ins><span class="cx"> if (!cachedImage || !cachedImage->hasImage())
</span><span class="cx"> return nullptr;
</span><span class="cx"> return cachedImage->image()->getCGImageRef();
</span></span></pre>
</div>
</div>
</body>
</html>