Changeset 140702 in webkit

Timestamp:

Jan 24, 2013 11:35:17 AM (11 years ago)

Author:

mvujovic@adobe.com

Message:

[CSS Filters] CSS opacity property clips filter outsets
​https://bugs.webkit.org/show_bug.cgi?id=106549

Reviewed by Dirk Schulze.

Source/WebCore:

Expand the transparencyClipBox for filter outsets and pass the filter output rect instead of
the input rect to beginTransparencyLayers for clipping. Details below.

Test: css3/filters/css-opacity-with-drop-shadow.html

• rendering/RenderLayer.cpp:

(WebCore):
(WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):

Replace filter outset calcuation with a call to expandRectForFilterOutsets.

(WebCore::expandRectForFilterOutsets):

New method to factor out repeated filter outset calculation code.

(WebCore::transparencyClipBox):

After expanding the clip rect for descendants and reflection, expand it for filter
outsets, so they don't get clipped when we begin a transparency layer.

(WebCore::RenderLayer::paintLayerContents):

Pass paintingInfo.paintDirtyRect instead of localPaintingInfo.paintDirtyRect to
beginTransparencyLayers for clipping. localPaintingInfo.paintDirtyRect (aka the filter
input rect) does not contain filter outsets, so they would get clipped. Now, we pass
paintingInfo.paintDirtyRect (the filter output rect), which includes the filter outsets.

(WebCore::RenderLayer::calculateLayerBounds):

Replace filter outset calcuation with a call to expandRectForFilterOutsets.

• rendering/RenderLayer.h:

(RenderLayer):

LayoutTests:

Add a reftest to verify that an element's drop shadow filter is not clipped when a CSS
opacity property is not applied.

• css3/filters/css-opacity-with-drop-shadow-expected.html: Added.
• css3/filters/css-opacity-with-drop-shadow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/css-opacity-with-drop-shadow-expected.html (added)
• LayoutTests/css3/filters/css-opacity-with-drop-shadow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-24  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Filters] CSS opacity property clips filter outsets
+        https://bugs.webkit.org/show_bug.cgi?id=106549
+
+        Reviewed by Dirk Schulze.
+
+        Add a reftest to verify that an element's drop shadow filter is not clipped when a CSS
+        opacity property is not applied.
+
+        * css3/filters/css-opacity-with-drop-shadow-expected.html: Added.
+        * css3/filters/css-opacity-with-drop-shadow.html: Added.
+
 2013-01-24  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-24  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Filters] CSS opacity property clips filter outsets
+        https://bugs.webkit.org/show_bug.cgi?id=106549
+
+        Reviewed by Dirk Schulze.
+
+        Expand the transparencyClipBox for filter outsets and pass the filter output rect instead of
+        the input rect to beginTransparencyLayers for clipping. Details below.
+
+        Test: css3/filters/css-opacity-with-drop-shadow.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore):
+        (WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
+            Replace filter outset calcuation with a call to expandRectForFilterOutsets.
+        (WebCore::expandRectForFilterOutsets):
+            New method to factor out repeated filter outset calculation code.
+        (WebCore::transparencyClipBox):
+            After expanding the clip rect for descendants and reflection, expand it for filter
+            outsets, so they don't get clipped when we begin a transparency layer.
+        (WebCore::RenderLayer::paintLayerContents):
+            Pass paintingInfo.paintDirtyRect instead of localPaintingInfo.paintDirtyRect to
+            beginTransparencyLayers for clipping. localPaintingInfo.paintDirtyRect (aka the filter
+            input rect) does not contain filter outsets, so they would get clipped. Now, we pass
+            paintingInfo.paintDirtyRect (the filter output rect), which includes the filter outsets.
+        (WebCore::RenderLayer::calculateLayerBounds):
+            Replace filter outset calcuation with a call to expandRectForFilterOutsets.
+        * rendering/RenderLayer.h:
+        (RenderLayer):
+
 2013-01-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1363 +1363 @@
 }
 
+static inline void expandRectForFilterOutsets(LayoutRect& rect, const RenderLayerModelObject* renderer)
+{
+    ASSERT(renderer);
+    if (!renderer->style()->hasFilterOutsets())
+        return;
+
+    int topOutset;
+    int rightOutset;
+    int bottomOutset;
+    int leftOutset;
+    renderer->style()->getFilterOutsets(topOutset, rightOutset, bottomOutset, leftOutset);
+    rect.move(-leftOutset, -topOutset);
+    rect.expand(leftOutset + rightOutset, topOutset + bottomOutset);
+}
+
 void RenderLayer::setFilterBackendNeedsRepaintingInRect(const LayoutRect& rect, bool immediate)
 {
@@ -1369 +1384 @@
     
     LayoutRect rectForRepaint = rect;
-    
-#if ENABLE(CSS_FILTERS)
-    if (renderer()->style()->hasFilterOutsets()) {
-        int topOutset;
-        int rightOutset;
-        int bottomOutset;
-        int leftOutset;
-        renderer()->style()->getFilterOutsets(topOutset, rightOutset, bottomOutset, leftOutset);
-        rectForRepaint.move(-leftOutset, -topOutset);
-        rectForRepaint.expand(leftOutset + rightOutset, topOutset + bottomOutset);
-    }
-#endif
+    expandRectForFilterOutsets(rectForRepaint, renderer());
 
     RenderLayerFilterInfo* filterInfo = this->filterInfo();
@@ -1548 +1552 @@
         LayoutRect clipRect = layer->boundingBox(layer);
         expandClipRectForDescendantsAndReflection(clipRect, layer, layer, paintBehavior);
+#if ENABLE(CSS_FILTERS)
+        expandRectForFilterOutsets(clipRect, layer->renderer());
+#endif
         return transform.mapRect(clipRect);
     }
@@ -1553 +1560 @@
     LayoutRect clipRect = layer->boundingBox(rootLayer);
     expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, paintBehavior);
+#if ENABLE(CSS_FILTERS)
+    expandRectForFilterOutsets(clipRect, layer->renderer());
+#endif
     return clipRect;
 }
@@ -3702 +3712 @@
             // Begin transparency layers lazily now that we know we have to paint something.
             if (haveTransparency)
-                beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, localPaintingInfo.paintDirtyRect, localPaintingInfo.paintBehavior);
+                beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, paintingInfo.paintDirtyRect, localPaintingInfo.paintBehavior);
         
             if (useClipRect) {
@@ -3729 +3739 @@
             // Begin transparency layers lazily now that we know we have to paint something.
             if (haveTransparency)
-                beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, localPaintingInfo.paintDirtyRect, localPaintingInfo.paintBehavior);
+                beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, paintingInfo.paintDirtyRect, localPaintingInfo.paintBehavior);
 
             if (useClipRect) {
@@ -4962 +4972 @@
     // filtered areas with the outsets if we know that the filter is going to render in hardware.
     // https://bugs.webkit.org/show_bug.cgi?id=81239
-    if ((flags & IncludeLayerFilterOutsets) && renderer->style()->hasFilterOutsets()) {
-        int topOutset;
-        int rightOutset;
-        int bottomOutset;
-        int leftOutset;
-        renderer->style()->getFilterOutsets(topOutset, rightOutset, bottomOutset, leftOutset);
-        unionBounds.move(-leftOutset, -topOutset);
-        unionBounds.expand(leftOutset + rightOutset, topOutset + bottomOutset);
-    }
+    if (flags & IncludeLayerFilterOutsets)
+        expandRectForFilterOutsets(unionBounds, renderer);
 #endif