[wip] unprefix filter

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 4c95c4a9b3a672ae3c79dfa53bceb4a841face6b..62c55c7e97a0f8888aed865e2aa64d07ed54eaa2 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp
@@ -247,11 +247,11 @@ void LayoutSVGResourceContainer::registerResource()
         if (layoutObject->hasLayer() && resourceType() == FilterResourceType) {
             if (style.hasFilter())
                 toLayoutBoxModelObject(layoutObject)->layer()->filterNeedsPaintInvalidation();
-            // If this is the SVG root, we could have both 'filter' and
-            // '-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())
+            // If this is the SVG root, we could have 'filter' applied and

[fs, 2016/05/23 12:29:53]

This comment does make a lot of sense anymore. If !style.hasFilter() this
resource does not apply at all, so 'continue' should be enough in that case. I
guess for LayoutSVGRoot we might need to call
markForLayoutAndParentResourceInvalidation (like clientStyleChanged does now) to
notify any dependents. filterNeedsPaintInvalidation() will mark for paint
invalidation and don't think marking for layout should be needed anymore (used
to be needed because some bounds needed to be recomputed I think.)

So maybe something like:

if (!style.hasFilter())
    continue;
toLayoutBoxModelObject(layoutObject)->layer()->filterNeedsPaintInvalidation();
if (layoutObject->isSVGRoot())
    markForLayoutAndParentResourceInvalidation(layoutObject, false);
continue;

[Noel Gordon, 2016/05/29 04:15:28]

Thanks for the code.  I tried it and the two tests in question failed

  svg/custom/cross-referenced-resources.html [ Failure ]
  svg/filters/filter-on-svg-root-w-layer.html [ Failure ]

sorry to say.  If I let the svgRoot fall into the full invalidation code that
the original comment mentioned, then these tests pass.  So I did that for now
(and adjusted the comment).

[fs, 2016/05/30 11:58:52]

Yes, this was under the assumption that FilterPainter was applying the filter,
and no state was kept in SVGResources. If the PaintLayer isn't painting the
filter, then the filterNeedsPaintInvalidation() ought to be redundant instead.

+            // so 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.hasFilter())
                 continue;
         }