Changeset 112644 in webkit

Timestamp:

Mar 29, 2012 10:07:06 PM (12 years ago)

Author:

Alexandru Chiculita

Message:

[CSS Filters] Trigger a repaint on elements with changed filter
​https://bugs.webkit.org/show_bug.cgi?id=82521

Reviewed by Dean Jackson.

Source/WebCore:

I've added ContextSensitivePropertyFilter and changed RenderStyle::diff to use it when
the filter property is changed. In RenderObject::adjustStyleDifference the appropriate StyleDifferenceRepaintLayer
or StyleDifferenceRecompositeLayer is used depending on whether the layer is painting filters in software or in hardware
(composited).

Tests: css3/filters/filter-change-repaint-composited.html

css3/filters/filter-change-repaint.html

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::createFilterOperations): None was treated as an invalid value.

• platform/graphics/ca/mac/PlatformCALayerMac.mm: Shadows were remaining behind. Fixed that.

(PlatformCALayer::setFilters):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::styleWillChange): Repaint the layer when there is a layout change and a filter change.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::styleChanged): Making sure that the backing store is repainted when filters fallback to hardware.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::adjustStyleDifference):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

• rendering/style/RenderStyleConstants.h:

LayoutTests:

Repaint was not triggered when the filter property was changed. I've added two
tests, one for software and one for composited mode. Both tests are triggering
all the possible scenarios of changing the filter property.

• css3/filters/filter-change-repaint-composited-expected.png: Added.
• css3/filters/filter-change-repaint-composited-expected.txt: Added.
• css3/filters/filter-change-repaint-composited.html: Added.
• css3/filters/filter-change-repaint-expected.png: Added.
• css3/filters/filter-change-repaint-expected.txt: Added.
• css3/filters/filter-change-repaint.html: Added.
• platform/chromium/test_expectations.txt: Disabled the new tests on Chromium. They need rebaselining.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/filter-change-repaint-composited-expected.png (added)
• LayoutTests/css3/filters/filter-change-repaint-composited-expected.txt (added)
• LayoutTests/css3/filters/filter-change-repaint-composited.html (added)
• LayoutTests/css3/filters/filter-change-repaint-expected.png (added)
• LayoutTests/css3/filters/filter-change-repaint-expected.txt (added)
• LayoutTests/css3/filters/filter-change-repaint.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-29  Alexandru Chiculita  <achicu@adobe.com>
+
+        [CSS Filters] Trigger a repaint on elements with changed filter
+        https://bugs.webkit.org/show_bug.cgi?id=82521
+
+        Reviewed by Dean Jackson.
+
+        Repaint was not triggered when the filter property was changed. I've added two
+        tests, one for software and one for composited mode. Both tests are triggering
+        all the possible scenarios of changing the filter property.
+
+        * css3/filters/filter-change-repaint-composited-expected.png: Added.
+        * css3/filters/filter-change-repaint-composited-expected.txt: Added.
+        * css3/filters/filter-change-repaint-composited.html: Added.
+        * css3/filters/filter-change-repaint-expected.png: Added.
+        * css3/filters/filter-change-repaint-expected.txt: Added.
+        * css3/filters/filter-change-repaint.html: Added.
+        * platform/chromium/test_expectations.txt: Disabled the new tests on Chromium. They need rebaselining.
+
 2012-03-29  Bear Travis  <betravis@adobe.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3180 +3180 @@
 BUGWK71392 WIN : css3/filters/custom = FAIL
 
+// Need rebaselining for Chromium
+BUGWK82521 SKIP : css3/filters/filter-change-repaint-composited.html = FAIL
+BUGWK82521 SKIP : css3/filters/filter-change-repaint.html = FAIL
+
 // <style scoped> not yet enabled.
 BUGWK49142 SKIP : fast/css/style-scoped = PASS

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-29  Alexandru Chiculita  <achicu@adobe.com>
+
+        [CSS Filters] Trigger a repaint on elements with changed filter
+        https://bugs.webkit.org/show_bug.cgi?id=82521
+
+        Reviewed by Dean Jackson.
+
+        I've added ContextSensitivePropertyFilter and changed RenderStyle::diff to use it when
+        the filter property is changed. In RenderObject::adjustStyleDifference the appropriate StyleDifferenceRepaintLayer
+        or StyleDifferenceRecompositeLayer is used depending on whether the layer is painting filters in software or in hardware
+        (composited).
+
+        Tests: css3/filters/filter-change-repaint-composited.html
+               css3/filters/filter-change-repaint.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::createFilterOperations): None was treated as an invalid value.
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm: Shadows were remaining behind. Fixed that.
+        (PlatformCALayer::setFilters):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::styleWillChange): Repaint the layer when there is a layout change and a filter change.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::styleChanged): Making sure that the backing store is repainted when filters fallback to hardware.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::adjustStyleDifference):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        * rendering/style/RenderStyleConstants.h:
+
 2012-03-29  Koji Ishii  <kojiishi@gmail.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -5525 +5525 @@
 bool CSSStyleSelector::createFilterOperations(CSSValue* inValue, RenderStyle* style, RenderStyle* rootStyle, FilterOperations& outOperations)
 {
-    if (!inValue || !inValue->isValueList()) {
-        outOperations.clear();
-        return false;
-    }
+    ASSERT(outOperations.isEmpty());
+    
+    if (!inValue)
+        return false;
+    
+    if (inValue->isPrimitiveValue()) {
+        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(inValue);
+        if (primitiveValue->getIdent() == CSSValueNone)
+            return true;
+    }
+    
+    if (!inValue->isValueList())
+        return false;
 
     float zoomFactor = style ? style->effectiveZoom() : 1;

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

@@ -710 +710 @@
 {
     if (!filters.size()) {
-        [m_layer.get() setFilters:0];
+        BEGIN_BLOCK_OBJC_EXCEPTIONS
+        [m_layer.get() setFilters:nil];
+        [m_layer.get() setShadowOffset:CGSizeZero];
+        [m_layer.get() setShadowColor:nil];
+        [m_layer.get() setShadowRadius:0];
+        [m_layer.get() setShadowOpacity:0];
+        END_BLOCK_OBJC_EXCEPTIONS
         return;
     }

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -27 +27 @@
 #include "RenderBoxModelObject.h"
 
+#include "FilterOperations.h"
 #include "GraphicsContext.h"
 #include "HTMLFrameOwnerElement.h"
@@ -330 +331 @@
                     || oldStyle->hasClip() != newStyle->hasClip()
                     || oldStyle->opacity() != newStyle->opacity()
-                    || oldStyle->transform() != newStyle->transform())
+                    || oldStyle->transform() != newStyle->transform()
+#if ENABLE(CSS_FILTERS)
+                    || oldStyle->filter() != newStyle->filter()
+#endif
+                    )
                 layer()->repaintIncludingDescendants();
-            } else if (newStyle->hasTransform() || newStyle->opacity() < 1) {
+            } else if (newStyle->hasTransform() || newStyle->opacity() < 1 || newStyle->hasFilter()) {
                 // If we don't have a layer yet, but we are going to get one because of transform or opacity,
                 //  then we need to repaint the old position of the object.

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4399 +4399 @@
     }
     
-#if ENABLE(CSS_FILTERS)
-    updateOrRemoveFilterEffect();
-#endif
-
     if (Frame* frame = renderer()->frame()) {
         if (FrameView* frameView = frame->view()) {
@@ -4420 +4416 @@
     updateScrollCornerStyle();
     updateResizerStyle();
+
+#if ENABLE(CSS_FILTERS)
+    bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
+#endif
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -4431 +4431 @@
         if (stackingContext()->hasCompositingDescendant())
             compositor()->setCompositingLayersNeedRebuild();
+    }
+#endif
+
+#if ENABLE(CSS_FILTERS)
+    updateOrRemoveFilterEffect();
+    if (isComposited() && backingDidCompositeLayers && !backing()->canCompositeFilters()) {
+        // The filters used to be drawn by platform code, but now the platform cannot draw them anymore.
+        // Fallback to drawing them in software.
+        setBackingNeedsRepaint();
     }
 #endif

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1719 +1719 @@
     }
     
+#if ENABLE(CSS_FILTERS)
+    if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
+        RenderLayer* layer = toRenderBoxModelObject(this)->layer();
+        if (!layer->isComposited() || layer->paintsWithFilters())
+            diff = StyleDifferenceRepaintLayer;
+        else if (diff < StyleDifferenceRecompositeLayer)
+            diff = StyleDifferenceRecompositeLayer;
+    }
+#endif
+    
     // The answer to requiresLayer() for plugins and iframes can change outside of the style system,
     // since it depends on whether we decide to composite these elements. When the layer status of

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -420 +420 @@
         }
 
-#if ENABLE(CSS_FILTERS)
-        if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
-            && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
-            return StyleDifferenceLayout;
-        }
-#endif
 #if ENABLE(CSS_GRID_LAYOUT)
         if (rareNonInheritedData->m_grid.get() != other->rareNonInheritedData->m_grid.get()
@@ -606 +600 @@
 #endif
     }
+
+#if ENABLE(CSS_FILTERS)
+    if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
+        && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
+#if USE(ACCELERATED_COMPOSITING)
+        changedContextSensitiveProperties |= ContextSensitivePropertyFilter;
+        // Don't return; keep looking for another change.
+#else
+        return StyleDifferenceRepaintLayer;
+#endif
+    }
+#endif
 
     if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask

trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

@@ -64 +64 @@
     ContextSensitivePropertyNone = 0,
     ContextSensitivePropertyTransform = (1 << 0),
-    ContextSensitivePropertyOpacity = (1 << 1)
+    ContextSensitivePropertyOpacity = (1 << 1),
+    ContextSensitivePropertyFilter = (1 << 2)
 };