[wip] unprefix filter

third_party/WebKit/Source/core/paint/SVGPaintContext.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 129 matching lines @@
         if (!SVGMaskPainter(*masker).prepareEffect(m_object, paintInfo().context))
             return false;
         m_masker = masker;
     }
     return true;
 }
 
 bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources)
 {
     if (!resources) {
-        if (m_object.style()->svgStyle().hasFilter())
-            return false;
-    } else if (LayoutSVGResourceFilter* filter = resources->filter()) {
+        if (m_object.style()->hasFilter())
+            return false; // Do not allow a draw: the SVG filter is invalid.
+        return true;

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

return !m_object.style()->hasFilter();


?

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

I restored the old code, so done.

+    }
+
+    if (LayoutSVGResourceFilter* filter = resources->filter()) {
+        // The root element's filter is applied by the layer filter painter.

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

Shouldn't need to call this at all if m_object.isSVGRoot() - similarly to what
applyCompositingIfNecessary() does. Now that there's two checks like that it
could make sense to hoist that to applyClipMaskAndFilterIfNecessary? (Also, the
hasLayer call here seems redundant.)

There's also a check: !hasFilterResource in SVGRootPainter that seems redundant
now when the filter is (always) handled by the PaintLayer.

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

ditto, restored the old code.

+        if (m_object.isSVGRoot() && m_object.hasLayer())
+            return true;
+
         m_filterRecordingContext = adoptPtr(new SVGFilterRecordingContext(paintInfo().context));
         m_filter = filter;
         GraphicsContext* filterContext = SVGFilterPainter(*filter).prepareEffect(m_object, *m_filterRecordingContext);
         if (!filterContext)
             return false;
 
         // Because the filter needs to cache its contents we replace the context
         // during filtering with the filter's context.
         m_filterPaintInfo = adoptPtr(new PaintInfo(*filterContext, m_paintInfo));
 
         // Because we cache the filter contents and do not invalidate on paint
         // invalidation rect changes, we need to paint the entire filter region
         // so elements outside the initial paint (due to scrolling, etc) paint.
         m_filterPaintInfo->m_cullRect.m_rect = LayoutRect::infiniteIntRect();
     }
+

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

Drop.

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

ditto.

     return true;
 }
 
 bool SVGPaintContext::isIsolationInstalled() const
 {
     if (m_compositingRecorder)
         return true;
     if (m_masker || m_filter)
         return true;
     if (m_clipper && m_clipperState == SVGClipPainter::ClipperAppliedMask)
@@ skipping 44 matching lines @@
     // though.
     // Additionally, it's not really safe/guaranteed to be correct, as
     // something down the paint pipe may want to farther tweak the color
     // filter, which could yield incorrect results. (Consider just using
     // saveLayer() w/ this color filter explicitly instead.)
     paint.setColorFilter(sk_ref_sp(paintInfo.context.colorFilter()));
     return true;
 }
 
 } // namespace blink