Changeset 236416 in webkit

Timestamp:

Sep 24, 2018 11:20:46 AM (6 years ago)

Author:

Simon Fraser

Message:

feMorphology filter in CSS doesn't update when element moves
​https://bugs.webkit.org/show_bug.cgi?id=189895

Reviewed by Dean Jackson.

Source/WebCore:

SourceAlpha needs to be invalidated from clearIntermediateResults(),
so get it from the SVGFilterBuilder (which always creates one) and store in
a member variable.

Test: css3/filters/invalidate-sourceAlpha.html

• rendering/CSSFilter.cpp:

(WebCore::CSSFilter::buildReferenceFilter):
(WebCore::CSSFilter::clearIntermediateResults):

• rendering/CSSFilter.h:
• svg/graphics/filters/SVGFilterBuilder.h:

LayoutTests:

Test that moves a box inside a filtered div. Masking is necessary to work
around bugs in feMorphology invalidation (webkit.org/b/189896).

• css3/filters/invalidate-sourceAlpha-expected.html: Added.
• css3/filters/invalidate-sourceAlpha.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/invalidate-sourceAlpha-expected.html (added)
• LayoutTests/css3/filters/invalidate-sourceAlpha.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/CSSFilter.cpp (modified) (3 diffs)
• Source/WebCore/rendering/CSSFilter.h (modified) (2 diffs)
• Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-24  Simon Fraser  <simon.fraser@apple.com>
+
+        feMorphology filter in CSS doesn't update when element moves
+        https://bugs.webkit.org/show_bug.cgi?id=189895
+
+        Reviewed by Dean Jackson.
+        
+        Test that moves a box inside a filtered div. Masking is necessary to work
+        around bugs in feMorphology invalidation (webkit.org/b/189896).
+
+        * css3/filters/invalidate-sourceAlpha-expected.html: Added.
+        * css3/filters/invalidate-sourceAlpha.html: Added.
+
 2018-09-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-24  Simon Fraser  <simon.fraser@apple.com>
+
+        feMorphology filter in CSS doesn't update when element moves
+        https://bugs.webkit.org/show_bug.cgi?id=189895
+
+        Reviewed by Dean Jackson.
+        
+        SourceAlpha needs to be invalidated from clearIntermediateResults(),
+        so get it from the SVGFilterBuilder (which always creates one) and store in
+        a member variable.
+
+        Test: css3/filters/invalidate-sourceAlpha.html
+
+        * rendering/CSSFilter.cpp:
+        (WebCore::CSSFilter::buildReferenceFilter):
+        (WebCore::CSSFilter::clearIntermediateResults):
+        * rendering/CSSFilter.h:
+        * svg/graphics/filters/SVGFilterBuilder.h:
+
 2018-09-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/CSSFilter.cpp

@@ -41 +41 @@
 #include "SVGFilterBuilder.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
+#include "SourceAlpha.h"
 #include "SourceGraphic.h"
 #include <algorithm>
@@ -112 +113 @@
 
     auto builder = std::make_unique<SVGFilterBuilder>(&previousEffect);
+    m_sourceAlpha = builder->getEffectById(SourceAlpha::effectName());
 
     for (auto& effectElement : childrenOfType<SVGFilterPrimitiveStandardAttributes>(*filter)) {
@@ -356 +358 @@
 {
     m_sourceGraphic->clearResult();
+    if (m_sourceAlpha)
+        m_sourceAlpha->clearResult();
     for (auto& effect : m_effects)
         effect->clearResult();

trunk/Source/WebCore/rendering/CSSFilter.h

@@ -38 +38 @@
 class ReferenceFilterOperation;
 class RenderElement;
+class SourceAlpha;
 class SourceGraphic;
 
@@ -91 +92 @@
     Vector<Ref<FilterEffect>> m_effects;
     Ref<SourceGraphic> m_sourceGraphic;
+    RefPtr<FilterEffect> m_sourceAlpha;
 
     IntRectExtent m_outsets;

trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h

@@ -47 +47 @@
     void add(const AtomicString& id, RefPtr<FilterEffect>);
 
-    RefPtr<FilterEffect> getEffectById(const AtomicString& id) const;
+    RefPtr<FilterEffect> getEffectById(const AtomicString&) const;
     FilterEffect* lastEffect() const { return m_lastEffect.get(); }