<!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>[163242] 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/163242">163242</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-01 08:32:11 -0800 (Sat, 01 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add security-checked casts for all WebCore::CachedResource subclasses
<http://webkit.org/b/127988>
Reviewed by Darin Adler.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::cachedResourceContent):
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
- Switch from static_cast<>() to security-checked cast.
* loader/cache/CachedCSSStyleSheet.h:
(WebCore::toCachedCSSStyleSheet): Add.
* loader/cache/CachedFont.h:
(WebCore::toCachedFont): Add.
* loader/cache/CachedImage.h: Make CachedImageManual final.
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::CachedRawResource): Add assert that
only MainResource or RawResource types are used to construct a
CachedRawResource. This may be a security issue depending on
what code exists that uses the type() value to cast to a
CachedResource subclass.
(WebCore::CachedRawResource::switchClientsToRevalidatedResource):
Switch from static_cast<>() to toCachedRawResource().
* loader/cache/CachedRawResource.h:
(WebCore::toCachedRawResource): Add.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::isMainOrRawResource): Add. A
CachedRawResource could be either a MainResource or a
RawResource. Currently only used in assertions.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestFont):
(WebCore::CachedResourceLoader::requestTextTrack):
(WebCore::CachedResourceLoader::requestCSSStyleSheet):
(WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
(WebCore::CachedResourceLoader::requestScript):
(WebCore::CachedResourceLoader::requestXSLStyleSheet):
(WebCore::CachedResourceLoader::requestSVGDocument):
(WebCore::CachedResourceLoader::requestRawResource):
(WebCore::CachedResourceLoader::requestMainResource):
- Switch from static_cast<>() to security-checked cast.
* loader/cache/CachedSVGDocument.h:
(WebCore::toCachedSVGDocument): Add.
* loader/cache/CachedScript.h:
(WebCore::toCachedScript): Add.
* loader/cache/CachedTextTrack.h:
(WebCore::toCachedTextTrack): Add.
* loader/cache/CachedXSLStyleSheet.h:
(WebCore::toCachedXSLStyleSheet): Add.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheeth">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFonth">trunk/Source/WebCore/loader/cache/CachedFont.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourceh">trunk/Source/WebCore/loader/cache/CachedRawResource.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="#trunkSourceWebCoreloadercacheCachedSVGDocumenth">trunk/Source/WebCore/loader/cache/CachedSVGDocument.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScripth">trunk/Source/WebCore/loader/cache/CachedScript.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedTextTrackh">trunk/Source/WebCore/loader/cache/CachedTextTrack.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedXSLStyleSheeth">trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/ChangeLog 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-02-01 David Kilzer <ddkilzer@apple.com>
+
+ Add security-checked casts for all WebCore::CachedResource subclasses
+ <http://webkit.org/b/127988>
+
+ Reviewed by Darin Adler.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResourceContent):
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
+ - Switch from static_cast<>() to security-checked cast.
+
+ * loader/cache/CachedCSSStyleSheet.h:
+ (WebCore::toCachedCSSStyleSheet): Add.
+ * loader/cache/CachedFont.h:
+ (WebCore::toCachedFont): Add.
+
+ * loader/cache/CachedImage.h: Make CachedImageManual final.
+
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::CachedRawResource): Add assert that
+ only MainResource or RawResource types are used to construct a
+ CachedRawResource. This may be a security issue depending on
+ what code exists that uses the type() value to cast to a
+ CachedResource subclass.
+ (WebCore::CachedRawResource::switchClientsToRevalidatedResource):
+ Switch from static_cast<>() to toCachedRawResource().
+
+ * loader/cache/CachedRawResource.h:
+ (WebCore::toCachedRawResource): Add.
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::isMainOrRawResource): Add. A
+ CachedRawResource could be either a MainResource or a
+ RawResource. Currently only used in assertions.
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestFont):
+ (WebCore::CachedResourceLoader::requestTextTrack):
+ (WebCore::CachedResourceLoader::requestCSSStyleSheet):
+ (WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
+ (WebCore::CachedResourceLoader::requestScript):
+ (WebCore::CachedResourceLoader::requestXSLStyleSheet):
+ (WebCore::CachedResourceLoader::requestSVGDocument):
+ (WebCore::CachedResourceLoader::requestRawResource):
+ (WebCore::CachedResourceLoader::requestMainResource):
+ - Switch from static_cast<>() to security-checked cast.
+
+ * loader/cache/CachedSVGDocument.h:
+ (WebCore::toCachedSVGDocument): Add.
+ * loader/cache/CachedScript.h:
+ (WebCore::toCachedScript): Add.
+ * loader/cache/CachedTextTrack.h:
+ (WebCore::toCachedTextTrack): Add.
+ * loader/cache/CachedXSLStyleSheet.h:
+ (WebCore::toCachedXSLStyleSheet): Add.
+
</ins><span class="cx"> 2014-02-01 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fixed GTK+ CMake build after r162922.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -174,10 +174,10 @@
</span><span class="cx"> if (cachedResource) {
</span><span class="cx"> switch (cachedResource->type()) {
</span><span class="cx"> case CachedResource::CSSStyleSheet:
</span><del>- *result = static_cast<CachedCSSStyleSheet*>(cachedResource)->sheetText(false);
</del><ins>+ *result = toCachedCSSStyleSheet(cachedResource)->sheetText(false);
</ins><span class="cx"> return true;
</span><span class="cx"> case CachedResource::Script:
</span><del>- *result = static_cast<CachedScript*>(cachedResource)->script();
</del><ins>+ *result = toCachedScript(cachedResource)->script();
</ins><span class="cx"> return true;
</span><span class="cx"> case CachedResource::RawResource: {
</span><span class="cx"> ResourceBuffer* buffer = cachedResource->resourceBuffer();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> m_resourcesData->resourceCreated(requestId, loaderId);
</span><span class="cx"> m_resourcesData->addCachedResource(requestId, resource);
</span><span class="cx"> if (resource->type() == CachedResource::RawResource) {
</span><del>- CachedRawResource* rawResource = static_cast<CachedRawResource*>(resource);
</del><ins>+ CachedRawResource* rawResource = toCachedRawResource(resource);
</ins><span class="cx"> String rawRequestId = IdentifiersFactory::requestId(rawResource->identifier());
</span><span class="cx"> m_resourcesData->reuseXHRReplayData(requestId, rawRequestId);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> RefPtr<StyleSheetContents> m_parsedStyleSheetCache;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedCSSStyleSheet, CachedResource, CachedResource::CSSStyleSheet)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> friend class MemoryCache;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedFont, CachedResource, CachedResource::FontResource)
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // CachedFont_h
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> // FIXME: We should look to incorporate the functionality of CachedImageManual
</span><span class="cx"> // into CachedImage or find a better place for this class.
</span><span class="cx"> // FIXME: Remove the USE(CF) once we make MemoryCache::addImageToCache() platform-independent.
</span><del>-class CachedImageManual : public CachedImage {
</del><ins>+class CachedImageManual final : public CachedImage {
</ins><span class="cx"> public:
</span><span class="cx"> CachedImageManual(const URL&, Image*);
</span><span class="cx"> void addFakeClient() { addClient(m_fakeClient.get()); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> : CachedResource(resourceRequest, type)
</span><span class="cx"> , m_identifier(0)
</span><span class="cx"> {
</span><ins>+ // FIXME: The wrong CachedResource::Type here may cause a bad cast elsewhere.
+ ASSERT(isMainOrRawResource());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* CachedRawResource::calculateIncrementalDataChunk(ResourceBuffer* data, unsigned& incrementalDataLength)
</span><span class="lines">@@ -181,7 +183,7 @@
</span><span class="cx"> ASSERT(m_loader);
</span><span class="cx"> // If we're in the middle of a successful revalidation, responseReceived() hasn't been called, so we haven't set m_identifier.
</span><span class="cx"> ASSERT(!m_identifier);
</span><del>- static_cast<CachedRawResource*>(resourceToRevalidate())->m_identifier = m_loader->identifier();
</del><ins>+ toCachedRawResource(resourceToRevalidate())->m_identifier = m_loader->identifier();
</ins><span class="cx"> CachedResource::switchClientsToRevalidatedResource();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> Vector<RedirectPair> m_redirectChain;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TYPE_CASTS_BASE(CachedRawResource, CachedResource, resource, resource->isMainOrRawResource(), resource.isMainOrRawResource())
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // CachedRawResource_h
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> SubresourceLoader* loader() { return m_loader.get(); }
</span><span class="cx">
</span><span class="cx"> bool isImage() const { return type() == ImageResource; }
</span><ins>+ // FIXME: CachedRawResource could be either a main resource or a raw XHR resource.
+ bool isMainOrRawResource() const { return type() == MainResource || type() == RawResource; }
</ins><span class="cx"> bool ignoreForRequestCount() const
</span><span class="cx"> {
</span><span class="cx"> return type() == MainResource
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -165,19 +165,19 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedFont> CachedResourceLoader::requestFont(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedFont*>(requestResource(CachedResource::FontResource, request).get());
</del><ins>+ return toCachedFont(requestResource(CachedResource::FontResource, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> CachedResourceHandle<CachedTextTrack> CachedResourceLoader::requestTextTrack(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedTextTrack*>(requestResource(CachedResource::TextTrackResource, request).get());
</del><ins>+ return toCachedTextTrack(requestResource(CachedResource::TextTrackResource, request).get());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedCSSStyleSheet> CachedResourceLoader::requestCSSStyleSheet(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedCSSStyleSheet*>(requestResource(CachedResource::CSSStyleSheet, request).get());
</del><ins>+ return toCachedCSSStyleSheet(requestResource(CachedResource::CSSStyleSheet, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedCSSStyleSheet> CachedResourceLoader::requestUserCSSStyleSheet(CachedResourceRequest& request)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> if (CachedResource* existing = memoryCache()->resourceForRequest(request.resourceRequest())) {
</span><span class="cx"> if (existing->type() == CachedResource::CSSStyleSheet)
</span><del>- return static_cast<CachedCSSStyleSheet*>(existing);
</del><ins>+ return toCachedCSSStyleSheet(existing);
</ins><span class="cx"> memoryCache()->remove(existing);
</span><span class="cx"> }
</span><span class="cx"> if (url.string() != request.resourceRequest().url())
</span><span class="lines">@@ -208,20 +208,20 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedScript> CachedResourceLoader::requestScript(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedScript*>(requestResource(CachedResource::Script, request).get());
</del><ins>+ return toCachedScript(requestResource(CachedResource::Script, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> CachedResourceHandle<CachedXSLStyleSheet> CachedResourceLoader::requestXSLStyleSheet(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XSLStyleSheet, request).get());
</del><ins>+ return toCachedXSLStyleSheet(requestResource(CachedResource::XSLStyleSheet, request).get());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> CachedResourceHandle<CachedSVGDocument> CachedResourceLoader::requestSVGDocument(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedSVGDocument*>(requestResource(CachedResource::SVGDocumentResource, request).get());
</del><ins>+ return toCachedSVGDocument(requestResource(CachedResource::SVGDocumentResource, request).get());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -236,12 +236,12 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestRawResource(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedRawResource*>(requestResource(CachedResource::RawResource, request).get());
</del><ins>+ return toCachedRawResource(requestResource(CachedResource::RawResource, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestMainResource(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- return static_cast<CachedRawResource*>(requestResource(CachedResource::MainResource, request).get());
</del><ins>+ return toCachedRawResource(requestResource(CachedResource::MainResource, request).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const URL& url) const
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx"> virtual void finishLoading(ResourceBuffer*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedSVGDocument, CachedResource, CachedResource::SVGDocumentResource)
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // USE(SVG)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx"> String m_script;
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="cx"> };
</span><ins>+
+CACHED_RESOURCE_TYPE_CASTS(CachedScript, CachedResource, CachedResource::Script)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> virtual void finishLoading(ResourceBuffer*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedTextTrack, CachedResource, CachedResource::TextTrackResource)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (163241 => 163242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2014-02-01 15:30:41 UTC (rev 163241)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2014-02-01 16:32:11 UTC (rev 163242)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> virtual void finishLoading(ResourceBuffer*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+CACHED_RESOURCE_TYPE_CASTS(CachedXSLStyleSheet, CachedResource, CachedResource::XSLStyleSheet)
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>