Title: [174339] trunk/Source/WebCore
- Revision
- 174339
- Author
- [email protected]
- Date
- 2014-10-05 22:13:09 -0700 (Sun, 05 Oct 2014)
Log Message
Use is<>() / downcast<>() for CachedRawResource
https://bugs.webkit.org/show_bug.cgi?id=137439
Reviewed by Ryosuke Niwa.
Use is<>() / downcast<>() for CachedRawResource.
No new tests, no behavior change.
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::switchClientsToRevalidatedResource):
* loader/cache/CachedRawResource.h:
(isType):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestRawResource):
(WebCore::CachedResourceLoader::requestMainResource):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174338 => 174339)
--- trunk/Source/WebCore/ChangeLog 2014-10-06 05:10:55 UTC (rev 174338)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 05:13:09 UTC (rev 174339)
@@ -1,5 +1,26 @@
2014-10-05 Christophe Dumez <[email protected]>
+ Use is<>() / downcast<>() for CachedRawResource
+ https://bugs.webkit.org/show_bug.cgi?id=137439
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() for CachedRawResource.
+
+ No new tests, no behavior change.
+
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::switchClientsToRevalidatedResource):
+ * loader/cache/CachedRawResource.h:
+ (isType):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestRawResource):
+ (WebCore::CachedResourceLoader::requestMainResource):
+
+2014-10-05 Christophe Dumez <[email protected]>
+
Use is<>() / downcast<>() for TextTrack subclasses
https://bugs.webkit.org/show_bug.cgi?id=137438
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (174338 => 174339)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-06 05:10:55 UTC (rev 174338)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-06 05:13:09 UTC (rev 174339)
@@ -449,8 +449,7 @@
m_resourcesData->resourceCreated(requestId, loaderId);
m_resourcesData->addCachedResource(requestId, resource);
if (resource->type() == CachedResource::RawResource) {
- CachedRawResource* rawResource = toCachedRawResource(resource);
- String rawRequestId = IdentifiersFactory::requestId(rawResource->identifier());
+ String rawRequestId = IdentifiersFactory::requestId(downcast<CachedRawResource>(*resource).identifier());
m_resourcesData->reuseXHRReplayData(requestId, rawRequestId);
}
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (174338 => 174339)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-10-06 05:10:55 UTC (rev 174338)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-10-06 05:13:09 UTC (rev 174339)
@@ -188,7 +188,7 @@
ASSERT(m_loader);
// If we're in the middle of a successful revalidation, responseReceived() hasn't been called, so we haven't set m_identifier.
ASSERT(!m_identifier);
- toCachedRawResource(resourceToRevalidate())->m_identifier = m_loader->identifier();
+ downcast<CachedRawResource>(*resourceToRevalidate()).m_identifier = m_loader->identifier();
CachedResource::switchClientsToRevalidatedResource();
}
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (174338 => 174339)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-10-06 05:10:55 UTC (rev 174338)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-10-06 05:13:09 UTC (rev 174339)
@@ -89,8 +89,10 @@
Vector<RedirectPair> m_redirectChain;
};
-TYPE_CASTS_BASE(CachedRawResource, CachedResource, resource, resource->isMainOrRawResource(), resource.isMainOrRawResource())
+} // namespace WebCore
-}
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::CachedRawResource)
+ static bool isType(const WebCore::CachedResource& resource) { return resource.isMainOrRawResource(); }
+SPECIALIZE_TYPE_TRAITS_END()
#endif // CachedRawResource_h
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (174338 => 174339)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-10-06 05:10:55 UTC (rev 174338)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-10-06 05:13:09 UTC (rev 174339)
@@ -244,12 +244,12 @@
CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestRawResource(CachedResourceRequest& request)
{
- return toCachedRawResource(requestResource(CachedResource::RawResource, request).get());
+ return downcast<CachedRawResource>(requestResource(CachedResource::RawResource, request).get());
}
CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestMainResource(CachedResourceRequest& request)
{
- return toCachedRawResource(requestResource(CachedResource::MainResource, request).get());
+ return downcast<CachedRawResource>(requestResource(CachedResource::MainResource, request).get());
}
bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const URL& url) const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
