Refine invalidation of filter clients in LayoutSVGResourceContainer

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp

Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
index 8b46803e094506c34d4b7c6286ce423f1d943d8e..dc587c8beaab0eb5f8d46e78b0e6451ce4da8cf3 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
@@ -238,24 +238,31 @@ void LayoutSVGResourceContainer::registerResource()
     extensions.addResource(m_id, this);
 
     // Update cached resources of pending clients.
-    const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
-    for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
-        ASSERT((*it)->hasPendingResources());
-        extensions.clearHasPendingResourcesIfPossible(*it);
-        LayoutObject* layoutObject = (*it)->layoutObject();
+    for (const auto& pendingClient : *clients) {
+        ASSERT(pendingClient->hasPendingResources());
+        extensions.clearHasPendingResourcesIfPossible(pendingClient);
+        LayoutObject* layoutObject = pendingClient->layoutObject();
         if (!layoutObject)
             continue;
 
+        const ComputedStyle& style = layoutObject->styleRef();
+
         // If the client has a layer (is a non-SVGElement) we need to signal
         // invalidation in the same way as is done in markAllClientLayersForInvalidation above.
         if (layoutObject->hasLayer() && resourceType() == FilterResourceType) {
-            toLayoutBoxModelObject(layoutObject)->layer()->filterNeedsPaintInvalidation();
-            continue;
+            if (style.hasFilter())
+                toLayoutBoxModelObject(layoutObject)->layer()->filterNeedsPaintInvalidation();
+            // If this is the SVG root, we could have both 'filter' and

[Stephen White, 2015/09/25 14:22:22]

Should we log a bug for this case? It seems like after unprefixing, only one of
these invalidations will be necessary, no?

[fs, 2015/09/25 14:50:40]

I don't think that's necessary - when the properties merge then at least part of
this code will not compile anymore (at the very least the svgStyle().hasFilter()
bit), so it ought to fall out naturally (and not run the risk of being left
behind.)

+            // '-webkit-filter' applied, so we need to do the invalidation
+            // below as well, unless we can optimistically determine that
+            // 'filter' does not apply to the element in question.
+            if (!layoutObject->isSVGRoot() || !style.svgStyle().hasFilter())
+                continue;
         }
 
         StyleDifference diff;
         diff.setNeedsFullLayout();
-        SVGResourcesCache::clientStyleChanged(layoutObject, diff, layoutObject->styleRef());
+        SVGResourcesCache::clientStyleChanged(layoutObject, diff, style);
         layoutObject->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::SvgResourceInvalidated);
     }
 }