Diff
Modified: trunk/Source/WebCore/ChangeLog (173324 => 173325)
--- trunk/Source/WebCore/ChangeLog 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/ChangeLog 2014-09-05 19:25:57 UTC (rev 173325)
@@ -1,3 +1,46 @@
+2014-09-05 Andreas Kling <[email protected]>
+
+ CTTE: SVGResourcesCache should only allow RenderElements.
+ <https://webkit.org/b/136578>
+
+ Only RenderElement subclasses can use SVG resources.
+ Codify this by making SVGResourcesCache::m_cache keyed on RenderElement.
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/svg/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::selfWillPaint):
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::imageChanged):
+ * rendering/svg/RenderSVGResource.cpp:
+ (WebCore::requestPaintingResource):
+ (WebCore::removeFromCacheAndInvalidateDependencies):
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::paintReplaced):
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::shouldGenerateMarkerPositions):
+ (WebCore::RenderSVGShape::markerRect):
+ (WebCore::RenderSVGShape::drawMarkers):
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::invalidateResourcesOfChildren):
+ (WebCore::SVGRenderSupport::intersectRepaintRectWithResources):
+ (WebCore::SVGRenderSupport::filtersForceContainerLayout):
+ (WebCore::SVGRenderSupport::pointInClippingArea):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::resourcesCacheFromRenderer):
+ (WebCore::SVGResourcesCache::cachedResourcesForRenderer):
+ (WebCore::SVGResourcesCache::clientLayoutChanged):
+ (WebCore::SVGResourcesCache::clientDestroyed):
+ (WebCore::SVGResourcesCache::resourceDestroyed):
+ (WebCore::SVGResourcesCache::cachedResourcesForRenderObject): Deleted.
+ * rendering/svg/SVGResourcesCache.h:
+ * rendering/svg/SVGResourcesCycleSolver.cpp:
+ (WebCore::SVGResourcesCycleSolver::resourceContainsCycles):
+
2014-09-05 Simon Fraser <[email protected]>
IDB version changed events should have a valid eventType()
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -102,7 +102,7 @@
bool RenderSVGContainer::selfWillPaint()
{
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
return resources && resources->filter();
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -204,7 +204,7 @@
{
// The image resource defaults to nullImage until the resource arrives.
// This empty image may be cached by SVG resources which must be invalidated.
- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this))
+ if (auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this))
resources->removeClientFromCache(*this);
// Eventually notify parent resources, that we've changed.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -111,7 +111,7 @@
}
// If no resources are associated with the given renderer, return the color resource.
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
if (!resources) {
if (paintType == SVGPaint::SVG_PAINTTYPE_URI_NONE || !inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
return nullptr;
@@ -156,7 +156,7 @@
static inline void removeFromCacheAndInvalidateDependencies(RenderElement& renderer, bool needsLayout)
{
- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer)) {
+ if (auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer)) {
#if ENABLE(FILTERS)
if (RenderSVGResourceFilter* filter = resources->filter())
filter->removeClientFromCache(renderer);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -158,7 +158,7 @@
maskContext->concatCTM(animatedLocalTransform);
// clipPath can also be clipped by another clipPath.
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
RenderSVGResourceClipper* clipper;
bool succeeded;
if (resources && (clipper = resources->clipper())) {
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -247,7 +247,7 @@
// Don't paint if we don't have kids, except if we have filters we should paint those.
if (!firstChild()) {
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
if (!resources || !resources->filter()) {
if (page && paintInfo.phase == PaintPhaseForeground)
page->addRelevantUnpaintedObject(this, visualOverflowRect());
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -218,7 +218,7 @@
if (!graphicsElement().supportsMarkers())
return false;
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
if (!resources)
return false;
@@ -372,7 +372,7 @@
{
ASSERT(!m_markerPositions.isEmpty());
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
ASSERT(resources);
RenderSVGResourceMarker* markerStart = resources->markerStart();
@@ -448,7 +448,7 @@
{
ASSERT(!m_markerPositions.isEmpty());
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*this);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*this);
if (!resources)
return;
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -190,7 +190,7 @@
static inline void invalidateResourcesOfChildren(RenderElement& renderer)
{
ASSERT(!renderer.needsLayout());
- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer))
+ if (auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer))
resources->removeClientFromCache(renderer, false);
for (auto& child : childrenOfType<RenderElement>(renderer))
@@ -359,7 +359,7 @@
void SVGRenderSupport::intersectRepaintRectWithResources(const RenderElement& renderer, FloatRect& repaintRect)
{
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
if (!resources)
return;
@@ -382,7 +382,7 @@
if (!renderer.normalChildNeedsLayout())
return false;
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
if (!resources || !resources->filter())
return false;
@@ -393,7 +393,7 @@
{
// We just take clippers into account to determine if a point is on the node. The Specification may
// change later and we also need to check maskers.
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
if (!resources)
return true;
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -156,7 +156,7 @@
m_paintInfo->context->clipPath(clipPath.pathForReferenceRect(referenceBox), clipPath.windRule());
}
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(*m_renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*m_renderer);
if (!resources) {
#if ENABLE(FILTERS)
if (svgStyle.hasFilter())
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -75,21 +75,21 @@
resourceContainer->removeClient(renderer);
}
-static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderObject& renderer)
+static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderElement& renderer)
{
SVGDocumentExtensions* extensions = renderer.document().accessSVGExtensions();
ASSERT(extensions);
return extensions->resourcesCache();
}
-SVGResources* SVGResourcesCache::cachedResourcesForRenderObject(const RenderObject& renderer)
+SVGResources* SVGResourcesCache::cachedResourcesForRenderer(const RenderElement& renderer)
{
return resourcesCacheFromRenderer(renderer).m_cache.get(&renderer);
}
void SVGResourcesCache::clientLayoutChanged(RenderElement& renderer)
{
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
if (!resources)
return;
@@ -156,8 +156,7 @@
void SVGResourcesCache::clientDestroyed(RenderElement& renderer)
{
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
- if (resources)
+ if (auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer))
resources->removeClientFromCache(renderer);
resourcesCacheFromRenderer(renderer).removeResourcesFromRenderer(renderer);
@@ -175,7 +174,7 @@
// Mark users of destroyed resources as pending resolution based on the id of the old resource.
Element& resourceElement = resource.element();
- Element* clientElement = toElement(it.key->node());
+ Element* clientElement = it.key->element();
SVGDocumentExtensions* extensions = clientElement->document().accessSVGExtensions();
extensions->addPendingResource(resourceElement.getIdAttribute(), clientElement);
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2014-09-05 19:25:57 UTC (rev 173325)
@@ -39,7 +39,7 @@
SVGResourcesCache();
~SVGResourcesCache();
- static SVGResources* cachedResourcesForRenderObject(const RenderObject&);
+ static SVGResources* cachedResourcesForRenderer(const RenderElement&);
// Called from all SVG renderers addChild() methods.
static void clientWasAddedToTree(RenderObject&);
@@ -63,7 +63,7 @@
void addResourcesFromRenderer(RenderElement&, const RenderStyle&);
void removeResourcesFromRenderer(RenderElement&);
- typedef HashMap<const RenderObject*, std::unique_ptr<SVGResources>> CacheMap;
+ typedef HashMap<const RenderElement*, std::unique_ptr<SVGResources>> CacheMap;
CacheMap m_cache;
};
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp (173324 => 173325)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp 2014-09-05 19:20:18 UTC (rev 173324)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp 2014-09-05 19:25:57 UTC (rev 173325)
@@ -50,7 +50,7 @@
// First operate on the resources of the given renderer.
// <marker id="a"> <path marker-start="url(#b)"/> ...
// <marker id="b" marker-start="url(#a)"/>
- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer)) {
+ if (auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer)) {
HashSet<RenderSVGResourceContainer*> resourceSet;
resources->buildSetOfResources(resourceSet);
@@ -65,7 +65,7 @@
// <marker id="a"> <path marker-start="url(#b)"/> ...
// <marker id="b"> <path marker-start="url(#a)"/> ...
for (auto& child : childrenOfType<RenderElement>(renderer)) {
- SVGResources* childResources = SVGResourcesCache::cachedResourcesForRenderObject(child);
+ auto* childResources = SVGResourcesCache::cachedResourcesForRenderer(child);
if (!childResources)
continue;
