Changeset 53166 in webkit

Timestamp:

Jan 12, 2010 3:10:22 PM (14 years ago)

Author:

Beth Dakin

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=33550 REGRESSION: -
webkit-svg-shadow with opacity still over-clipped

Reviewed by Sam Weinig.

We need to call inflateForShadow() on the repaintRect before we
clip for opacity or we will over-clip.

• rendering/SVGRenderSupport.cpp:

(WebCore::SVGRenderBase::prepareToRenderSVGContent):

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=33550 REGRESSION:
-webkit-svg-shadow with opacity still over-clipped

Reviewed by Sam Weinig.

• platform/mac/svg/css/shadow-and-opacity-expected.checksum: Added.
• platform/mac/svg/css/shadow-and-opacity-expected.png: Added.
• platform/mac/svg/css/shadow-and-opacity-expected.txt: Added.
• svg/css/shadow-and-opacity.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.checksum (added)
• LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.png (added)
• LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.txt (added)
• LayoutTests/svg/css/shadow-and-opacity.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/SVGRenderSupport.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-12  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=33550 REGRESSION: 
+        -webkit-svg-shadow with opacity still over-clipped
+
+        * platform/mac/svg/css/shadow-and-opacity-expected.checksum: Added.
+        * platform/mac/svg/css/shadow-and-opacity-expected.png: Added.
+        * platform/mac/svg/css/shadow-and-opacity-expected.txt: Added.
+        * svg/css/shadow-and-opacity.svg: Added.
+
 2010-01-11  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-12  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=33550 REGRESSION: -
+        webkit-svg-shadow with opacity still over-clipped
+
+        We need to call inflateForShadow() on the repaintRect before we 
+        clip for opacity or we will over-clip.
+        * rendering/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderBase::prepareToRenderSVGContent):
+
 2010-01-12  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebCore/rendering/SVGRenderSupport.cpp

@@ -93 +93 @@
     ASSERT(svgStyle);
 
+    ShadowData* shadow = svgStyle->shadow();
+    IntRect repaintIntRectWithShadow = enclosingIntRect(repaintRect);
+    if (shadow)
+        svgStyle->inflateForShadow(repaintIntRectWithShadow);
+
     // Setup transparency layers before setting up filters!
     float opacity = style->opacity(); 
     if (opacity < 1.0f) {
-        paintInfo.context->clip(enclosingIntRect(repaintRect));
+        paintInfo.context->clip(repaintIntRectWithShadow);
         paintInfo.context->beginTransparencyLayer(opacity);
     }
 
-    if (ShadowData* shadow = svgStyle->shadow()) {
-        IntRect shadowRect = enclosingIntRect(repaintRect);
-        svgStyle->inflateForShadow(shadowRect);
-        paintInfo.context->clip(shadowRect);
+    if (shadow) {
+        paintInfo.context->clip(repaintIntRectWithShadow);
         paintInfo.context->setShadow(IntSize(shadow->x, shadow->y), shadow->blur, shadow->color, style->colorSpace());
         paintInfo.context->beginTransparencyLayer(1.0f);