Changeset 53300 in webkit

Timestamp:

Jan 14, 2010 5:13:18 PM (14 years ago)

Author:

Beth Dakin

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=33498 REGRESSION:
svg/css/circle-in-mask-with-shadow.svg failing pixel tests
-and corresponding-
<rdar://problem/7544176>

Reviewed by Sam Weinig.

This change makes repaintRectInLocalCoordinates return a rect that
is -webkit-svg-shadow-aware.

• rendering/RenderPath.cpp:

(WebCore::RenderPath::repaintRectInLocalCoordinates):

• rendering/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::repaintRectInLocalCoordinates):

• rendering/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::repaintRectInLocalCoordinates):

• rendering/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::repaintRectInLocalCoordinates):

• rendering/RenderSVGText.cpp:

(WebCore::RenderSVGText::repaintRectInLocalCoordinates):

• rendering/SVGRenderSupport.cpp:

(WebCore::SVGRenderBase::prepareToRenderSVGContent):

• rendering/style/SVGRenderStyle.cpp:

(WebCore::SVGRenderStyle::inflateForShadow):

• rendering/style/SVGRenderStyle.h:

LayoutTests: Tests for ​https://bugs.webkit.org/show_bug.cgi?id=33498 REGRESSION:
svg/css/circle-in-mask-with-shadow.svg failing pixel tests
-and corresponding-
<rdar://problem/7544176>

Reviewed by Sam Weinig.

All of these tests just needed to be updated because of small
rounding differences.

• platform/mac/fast/repaint/moving-shadow-on-container-expected.checksum:
• platform/mac/fast/repaint/moving-shadow-on-container-expected.png:
• platform/mac/fast/repaint/moving-shadow-on-container-expected.txt:
• platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum:
• platform/mac/fast/repaint/moving-shadow-on-path-expected.png:
• platform/mac/fast/repaint/moving-shadow-on-path-expected.txt:
• platform/mac/svg/css/arrow-with-shadow-expected.png:
• platform/mac/svg/css/arrow-with-shadow-expected.txt:
• platform/mac/svg/css/circle-in-mask-with-shadow-expected.checksum:
• platform/mac/svg/css/circle-in-mask-with-shadow-expected.png:
• platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt:
• platform/mac/svg/css/clippath-with-shadow-expected.png:
• platform/mac/svg/css/composite-shadow-example-expected.checksum:
• platform/mac/svg/css/composite-shadow-example-expected.png:
• platform/mac/svg/css/composite-shadow-example-expected.txt:
• platform/mac/svg/css/composite-shadow-with-opacity-expected.checksum:
• platform/mac/svg/css/composite-shadow-with-opacity-expected.png:
• platform/mac/svg/css/composite-shadow-with-opacity-expected.txt:
• platform/mac/svg/css/css-box-min-width-expected.checksum:
• platform/mac/svg/css/css-box-min-width-expected.png:
• platform/mac/svg/css/group-with-shadow-expected.txt:
• platform/mac/svg/css/mask-with-shadow-expected.txt:
• platform/mac/svg/css/path-with-shadow-expected.png:
• platform/mac/svg/css/path-with-shadow-expected.txt:
• platform/mac/svg/css/shadow-and-opacity-expected.txt:
• platform/mac/svg/css/shadow-with-large-radius-expected.txt:
• platform/mac/svg/css/shadow-with-negative-offset-expected.txt:
• platform/mac/svg/css/stars-with-shadow-expected.checksum:
• platform/mac/svg/css/stars-with-shadow-expected.png:
• platform/mac/svg/css/stars-with-shadow-expected.txt:
• platform/mac/svg/filters/shadow-on-rect-with-filter-expected.checksum:
• platform/mac/svg/filters/shadow-on-rect-with-filter-expected.png:
• platform/mac/svg/filters/shadow-on-rect-with-filter-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/arrow-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/arrow-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/clippath-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/composite-shadow-example-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/composite-shadow-example-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/composite-shadow-example-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/composite-shadow-with-opacity-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/composite-shadow-with-opacity-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/composite-shadow-with-opacity-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/css-box-min-width-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/css-box-min-width-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/group-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/mask-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/path-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/path-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-with-large-radius-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-with-negative-offset-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/stars-with-shadow-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/stars-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/stars-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/shadow-on-rect-with-filter-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/shadow-on-rect-with-filter-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/filters/shadow-on-rect-with-filter-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderPath.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGContainer.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGImage.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGRoot.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGText.cpp (modified) (1 diff)
• WebCore/rendering/SVGRenderSupport.cpp (modified) (1 diff)
• WebCore/rendering/style/SVGRenderStyle.cpp (modified) (1 diff)
• WebCore/rendering/style/SVGRenderStyle.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-14  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Tests for https://bugs.webkit.org/show_bug.cgi?id=33498 REGRESSION: 
+        svg/css/circle-in-mask-with-shadow.svg failing pixel tests
+        -and corresponding-
+        <rdar://problem/7544176>
+
+        All of these tests just needed to be updated because of small 
+        rounding differences. 
+
+        * platform/mac/fast/repaint/moving-shadow-on-container-expected.checksum:
+        * platform/mac/fast/repaint/moving-shadow-on-container-expected.png:
+        * platform/mac/fast/repaint/moving-shadow-on-container-expected.txt:
+        * platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum:
+        * platform/mac/fast/repaint/moving-shadow-on-path-expected.png:
+        * platform/mac/fast/repaint/moving-shadow-on-path-expected.txt:
+        * platform/mac/svg/css/arrow-with-shadow-expected.png:
+        * platform/mac/svg/css/arrow-with-shadow-expected.txt:
+        * platform/mac/svg/css/circle-in-mask-with-shadow-expected.checksum:
+        * platform/mac/svg/css/circle-in-mask-with-shadow-expected.png:
+        * platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt:
+        * platform/mac/svg/css/clippath-with-shadow-expected.png:
+        * platform/mac/svg/css/composite-shadow-example-expected.checksum:
+        * platform/mac/svg/css/composite-shadow-example-expected.png:
+        * platform/mac/svg/css/composite-shadow-example-expected.txt:
+        * platform/mac/svg/css/composite-shadow-with-opacity-expected.checksum:
+        * platform/mac/svg/css/composite-shadow-with-opacity-expected.png:
+        * platform/mac/svg/css/composite-shadow-with-opacity-expected.txt:
+        * platform/mac/svg/css/css-box-min-width-expected.checksum:
+        * platform/mac/svg/css/css-box-min-width-expected.png:
+        * platform/mac/svg/css/group-with-shadow-expected.txt:
+        * platform/mac/svg/css/mask-with-shadow-expected.txt:
+        * platform/mac/svg/css/path-with-shadow-expected.png:
+        * platform/mac/svg/css/path-with-shadow-expected.txt:
+        * platform/mac/svg/css/shadow-and-opacity-expected.txt:
+        * platform/mac/svg/css/shadow-with-large-radius-expected.txt:
+        * platform/mac/svg/css/shadow-with-negative-offset-expected.txt:
+        * platform/mac/svg/css/stars-with-shadow-expected.checksum:
+        * platform/mac/svg/css/stars-with-shadow-expected.png:
+        * platform/mac/svg/css/stars-with-shadow-expected.txt:
+        * platform/mac/svg/filters/shadow-on-rect-with-filter-expected.checksum:
+        * platform/mac/svg/filters/shadow-on-rect-with-filter-expected.png:
+        * platform/mac/svg/filters/shadow-on-rect-with-filter-expected.txt:
+
 2010-01-14  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.checksum

@@ -1 @@
-3388527c85ca52bfb34b33d849f4b20c
+16e5265732985f6bc2df85158002a2af

trunk/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 785x616
     RenderBody {BODY} at (8,8) size 769x600
-      RenderSVGRoot {svg} at (-59.81,-63.30) size 515.36x223.61
+      RenderSVGRoot {svg} at (-59,-63) size 524x233
         RenderPath {path} at (-59.81,-63.30) size 135.62x128.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
         RenderPath {path} at (200.68,46.49) size 117.09x113.83 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]

trunk/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum

@@ -1 @@
-3388527c85ca52bfb34b33d849f4b20c
+4611ec66fc4f3cd6f762047408b0db45

trunk/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 785x616
     RenderBody {BODY} at (8,8) size 769x600
-      RenderSVGRoot {svg} at (-59.81,-63.30) size 515.36x223.61
-        RenderPath {path} at (-59.81,-63.30) size 135.62x128.98 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
-        RenderPath {path} at (200.68,46.49) size 117.09x113.83 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
-        RenderPath {path} at (349.70,46.70) size 105.85x110.89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(400.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,25.00 L-29.39,40.45 L-23.78,7.73 L-47.55,-15.45 L-14.69,-20.23 L-0.00,-50.00 L14.69,-20.23 L47.55,-15.45 L23.78,7.73 L29.39,40.45 Z"]
+      RenderSVGRoot {svg} at (-59,-63) size 524x233
+        RenderPath {path} at (-59,-63) size 144x138 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+        RenderPath {path} at (201,47) size 126x123 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+        RenderPath {path} at (350,47) size 115x120 [transform={m=((1.00,0.00)(0.00,1.00)) t=(400.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,25.00 L-29.39,40.45 L-23.78,7.73 L-47.55,-15.45 L-14.69,-20.23 L-0.00,-50.00 L14.69,-20.23 L47.55,-15.45 L23.78,7.73 L29.39,40.45 Z"]

trunk/LayoutTests/platform/mac/svg/css/arrow-with-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (79.97,23.98) size 570.03x378.71
-    RenderSVGContainer {g} at (79.97,23.98) size 570.03x378.71 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
+  RenderSVGRoot {svg} at (76.67,23.33) size 606.67x410
+    RenderSVGContainer {g} at (76.67,23.33) size 606.67x410 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
       RenderSVGContainer {a} at (79.97,23.98) size 570.03x378.71
         RenderPath {path} at (79.97,23.98) size 570.03x378.71 [stroke={[type=SOLID] [color=#0000FF] [stroke width=20.00]}] [data="M185.00,40.00 L85.00,40.00 L85.00,28.00 L40.00,64.00 L85.00,100.00 L85.00,88.00 L185.00,88.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.checksum

@@ -1 @@
-966a5c8ba22282ac9c594cbbf67b3f70
+ae598dedf137008be554eac8446e2661

trunk/LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt

@@ -11 +11 @@
           RenderSVGGradientStop {stop} at (0,0) size 0x0
         RenderPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#FF0000)]] [start=(0,0)] [end=(1,1)]}] [data="M0.00,0.00 L300.00,0.00 L300.00,300.00 L0.00,300.00 Z"]
-        RenderSVGContainer {mask} at (5,5) size 210x210
-          RenderPath {circle} at (5,5) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,55.00 L104.90,58.14 L104.61,61.27 L104.11,64.37 L103.43,67.43 L102.55,70.45 L101.49,73.41 L100.24,76.29 L98.82,79.09 L97.22,81.79 L95.45,84.39 L93.53,86.87 L91.45,89.23 L89.23,91.45 L86.87,93.53 L84.39,95.45 L81.79,97.22 L79.09,98.82 L76.29,100.24 L73.41,101.49 L70.45,102.55 L67.43,103.43 L64.37,104.11 L61.27,104.61 L58.14,104.90 L55.00,105.00 L51.86,104.90 L48.73,104.61 L45.63,104.11 L42.57,103.43 L39.55,102.55 L36.59,101.49 L33.71,100.24 L30.91,98.82 L28.21,97.22 L25.61,95.45 L23.13,93.53 L20.77,91.45 L18.55,89.23 L16.47,86.87 L14.55,84.39 L12.78,81.79 L11.18,79.09 L9.76,76.29 L8.51,73.41 L7.45,70.45 L6.57,67.43 L5.89,64.37 L5.39,61.27 L5.10,58.14 L5.00,55.00 L5.10,51.86 L5.39,48.73 L5.89,45.63 L6.57,42.57 L7.45,39.55 L8.51,36.59 L9.76,33.71 L11.18,30.91 L12.78,28.21 L14.55,25.61 L16.47,23.13 L18.55,20.77 L20.77,18.55 L23.13,16.47 L25.61,14.55 L28.21,12.78 L30.91,11.18 L33.71,9.76 L36.59,8.51 L39.55,7.45 L42.57,6.57 L45.63,5.89 L48.73,5.39 L51.86,5.10 L55.00,5.00 L58.14,5.10 L61.27,5.39 L64.37,5.89 L67.43,6.57 L70.45,7.45 L73.41,8.51 L76.29,9.76 L79.09,11.18 L81.79,12.78 L84.39,14.55 L86.87,16.47 L89.23,18.55 L91.45,20.77 L93.53,23.13 L95.45,25.61 L97.22,28.21 L98.82,30.91 L100.24,33.71 L101.49,36.59 L102.55,39.55 L103.43,42.57 L104.11,45.63 L104.61,48.73 L104.90,51.86 Z"]
-          RenderPath {circle} at (5,115) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,165.00 L104.90,168.14 L104.61,171.27 L104.11,174.37 L103.43,177.43 L102.55,180.45 L101.49,183.41 L100.24,186.29 L98.82,189.09 L97.22,191.79 L95.45,194.39 L93.53,196.87 L91.45,199.23 L89.23,201.45 L86.87,203.53 L84.39,205.45 L81.79,207.22 L79.09,208.82 L76.29,210.24 L73.41,211.49 L70.45,212.55 L67.43,213.43 L64.37,214.11 L61.27,214.61 L58.14,214.90 L55.00,215.00 L51.86,214.90 L48.73,214.61 L45.63,214.11 L42.57,213.43 L39.55,212.55 L36.59,211.49 L33.71,210.24 L30.91,208.82 L28.21,207.22 L25.61,205.45 L23.13,203.53 L20.77,201.45 L18.55,199.23 L16.47,196.87 L14.55,194.39 L12.78,191.79 L11.18,189.09 L9.76,186.29 L8.51,183.41 L7.45,180.45 L6.57,177.43 L5.89,174.37 L5.39,171.27 L5.10,168.14 L5.00,165.00 L5.10,161.86 L5.39,158.73 L5.89,155.63 L6.57,152.57 L7.45,149.55 L8.51,146.59 L9.76,143.71 L11.18,140.91 L12.78,138.21 L14.55,135.61 L16.47,133.13 L18.55,130.77 L20.77,128.55 L23.13,126.47 L25.61,124.55 L28.21,122.78 L30.91,121.18 L33.71,119.76 L36.59,118.51 L39.55,117.45 L42.57,116.57 L45.63,115.89 L48.73,115.39 L51.86,115.10 L55.00,115.00 L58.14,115.10 L61.27,115.39 L64.37,115.89 L67.43,116.57 L70.45,117.45 L73.41,118.51 L76.29,119.76 L79.09,121.18 L81.79,122.78 L84.39,124.55 L86.87,126.47 L89.23,128.55 L91.45,130.77 L93.53,133.13 L95.45,135.61 L97.22,138.21 L98.82,140.91 L100.24,143.71 L101.49,146.59 L102.55,149.55 L103.43,152.57 L104.11,155.63 L104.61,158.73 L104.90,161.86 Z"]
-          RenderPath {circle} at (115,5) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M215.00,55.00 L214.90,58.14 L214.61,61.27 L214.11,64.37 L213.43,67.43 L212.55,70.45 L211.49,73.41 L210.24,76.29 L208.82,79.09 L207.22,81.79 L205.45,84.39 L203.53,86.87 L201.45,89.23 L199.23,91.45 L196.87,93.53 L194.39,95.45 L191.79,97.22 L189.09,98.82 L186.29,100.24 L183.41,101.49 L180.45,102.55 L177.43,103.43 L174.37,104.11 L171.27,104.61 L168.14,104.90 L165.00,105.00 L161.86,104.90 L158.73,104.61 L155.63,104.11 L152.57,103.43 L149.55,102.55 L146.59,101.49 L143.71,100.24 L140.91,98.82 L138.21,97.22 L135.61,95.45 L133.13,93.53 L130.77,91.45 L128.55,89.23 L126.47,86.87 L124.55,84.39 L122.78,81.79 L121.18,79.09 L119.76,76.29 L118.51,73.41 L117.45,70.45 L116.57,67.43 L115.89,64.37 L115.39,61.27 L115.10,58.14 L115.00,55.00 L115.10,51.86 L115.39,48.73 L115.89,45.63 L116.57,42.57 L117.45,39.55 L118.51,36.59 L119.76,33.71 L121.18,30.91 L122.78,28.21 L124.55,25.61 L126.47,23.13 L128.55,20.77 L130.77,18.55 L133.13,16.47 L135.61,14.55 L138.21,12.78 L140.91,11.18 L143.71,9.76 L146.59,8.51 L149.55,7.45 L152.57,6.57 L155.63,5.89 L158.73,5.39 L161.86,5.10 L165.00,5.00 L168.14,5.10 L171.27,5.39 L174.37,5.89 L177.43,6.57 L180.45,7.45 L183.41,8.51 L186.29,9.76 L189.09,11.18 L191.79,12.78 L194.39,14.55 L196.87,16.47 L199.23,18.55 L201.45,20.77 L203.53,23.13 L205.45,25.61 L207.22,28.21 L208.82,30.91 L210.24,33.71 L211.49,36.59 L212.55,39.55 L213.43,42.57 L214.11,45.63 L214.61,48.73 L214.90,51.86 Z"]
-          RenderPath {circle} at (115,115) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M215.00,165.00 L214.90,168.14 L214.61,171.27 L214.11,174.37 L213.43,177.43 L212.55,180.45 L211.49,183.41 L210.24,186.29 L208.82,189.09 L207.22,191.79 L205.45,194.39 L203.53,196.87 L201.45,199.23 L199.23,201.45 L196.87,203.53 L194.39,205.45 L191.79,207.22 L189.09,208.82 L186.29,210.24 L183.41,211.49 L180.45,212.55 L177.43,213.43 L174.37,214.11 L171.27,214.61 L168.14,214.90 L165.00,215.00 L161.86,214.90 L158.73,214.61 L155.63,214.11 L152.57,213.43 L149.55,212.55 L146.59,211.49 L143.71,210.24 L140.91,208.82 L138.21,207.22 L135.61,205.45 L133.13,203.53 L130.77,201.45 L128.55,199.23 L126.47,196.87 L124.55,194.39 L122.78,191.79 L121.18,189.09 L119.76,186.29 L118.51,183.41 L117.45,180.45 L116.57,177.43 L115.89,174.37 L115.39,171.27 L115.10,168.14 L115.00,165.00 L115.10,161.86 L115.39,158.73 L115.89,155.63 L116.57,152.57 L117.45,149.55 L118.51,146.59 L119.76,143.71 L121.18,140.91 L122.78,138.21 L124.55,135.61 L126.47,133.13 L128.55,130.77 L130.77,128.55 L133.13,126.47 L135.61,124.55 L138.21,122.78 L140.91,121.18 L143.71,119.76 L146.59,118.51 L149.55,117.45 L152.57,116.57 L155.63,115.89 L158.73,115.39 L161.86,115.10 L165.00,115.00 L168.14,115.10 L171.27,115.39 L174.37,115.89 L177.43,116.57 L180.45,117.45 L183.41,118.51 L186.29,119.76 L189.09,121.18 L191.79,122.78 L194.39,124.55 L196.87,126.47 L199.23,128.55 L201.45,130.77 L203.53,133.13 L205.45,135.61 L207.22,138.21 L208.82,140.91 L210.24,143.71 L211.49,146.59 L212.55,149.55 L213.43,152.57 L214.11,155.63 L214.61,158.73 L214.90,161.86 Z"]
+        RenderSVGContainer {mask} at (5,5) size 220x220
+          RenderPath {circle} at (5,5) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,55.00 L104.90,58.14 L104.61,61.27 L104.11,64.37 L103.43,67.43 L102.55,70.45 L101.49,73.41 L100.24,76.29 L98.82,79.09 L97.22,81.79 L95.45,84.39 L93.53,86.87 L91.45,89.23 L89.23,91.45 L86.87,93.53 L84.39,95.45 L81.79,97.22 L79.09,98.82 L76.29,100.24 L73.41,101.49 L70.45,102.55 L67.43,103.43 L64.37,104.11 L61.27,104.61 L58.14,104.90 L55.00,105.00 L51.86,104.90 L48.73,104.61 L45.63,104.11 L42.57,103.43 L39.55,102.55 L36.59,101.49 L33.71,100.24 L30.91,98.82 L28.21,97.22 L25.61,95.45 L23.13,93.53 L20.77,91.45 L18.55,89.23 L16.47,86.87 L14.55,84.39 L12.78,81.79 L11.18,79.09 L9.76,76.29 L8.51,73.41 L7.45,70.45 L6.57,67.43 L5.89,64.37 L5.39,61.27 L5.10,58.14 L5.00,55.00 L5.10,51.86 L5.39,48.73 L5.89,45.63 L6.57,42.57 L7.45,39.55 L8.51,36.59 L9.76,33.71 L11.18,30.91 L12.78,28.21 L14.55,25.61 L16.47,23.13 L18.55,20.77 L20.77,18.55 L23.13,16.47 L25.61,14.55 L28.21,12.78 L30.91,11.18 L33.71,9.76 L36.59,8.51 L39.55,7.45 L42.57,6.57 L45.63,5.89 L48.73,5.39 L51.86,5.10 L55.00,5.00 L58.14,5.10 L61.27,5.39 L64.37,5.89 L67.43,6.57 L70.45,7.45 L73.41,8.51 L76.29,9.76 L79.09,11.18 L81.79,12.78 L84.39,14.55 L86.87,16.47 L89.23,18.55 L91.45,20.77 L93.53,23.13 L95.45,25.61 L97.22,28.21 L98.82,30.91 L100.24,33.71 L101.49,36.59 L102.55,39.55 L103.43,42.57 L104.11,45.63 L104.61,48.73 L104.90,51.86 Z"]
+          RenderPath {circle} at (5,115) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,165.00 L104.90,168.14 L104.61,171.27 L104.11,174.37 L103.43,177.43 L102.55,180.45 L101.49,183.41 L100.24,186.29 L98.82,189.09 L97.22,191.79 L95.45,194.39 L93.53,196.87 L91.45,199.23 L89.23,201.45 L86.87,203.53 L84.39,205.45 L81.79,207.22 L79.09,208.82 L76.29,210.24 L73.41,211.49 L70.45,212.55 L67.43,213.43 L64.37,214.11 L61.27,214.61 L58.14,214.90 L55.00,215.00 L51.86,214.90 L48.73,214.61 L45.63,214.11 L42.57,213.43 L39.55,212.55 L36.59,211.49 L33.71,210.24 L30.91,208.82 L28.21,207.22 L25.61,205.45 L23.13,203.53 L20.77,201.45 L18.55,199.23 L16.47,196.87 L14.55,194.39 L12.78,191.79 L11.18,189.09 L9.76,186.29 L8.51,183.41 L7.45,180.45 L6.57,177.43 L5.89,174.37 L5.39,171.27 L5.10,168.14 L5.00,165.00 L5.10,161.86 L5.39,158.73 L5.89,155.63 L6.57,152.57 L7.45,149.55 L8.51,146.59 L9.76,143.71 L11.18,140.91 L12.78,138.21 L14.55,135.61 L16.47,133.13 L18.55,130.77 L20.77,128.55 L23.13,126.47 L25.61,124.55 L28.21,122.78 L30.91,121.18 L33.71,119.76 L36.59,118.51 L39.55,117.45 L42.57,116.57 L45.63,115.89 L48.73,115.39 L51.86,115.10 L55.00,115.00 L58.14,115.10 L61.27,115.39 L64.37,115.89 L67.43,116.57 L70.45,117.45 L73.41,118.51 L76.29,119.76 L79.09,121.18 L81.79,122.78 L84.39,124.55 L86.87,126.47 L89.23,128.55 L91.45,130.77 L93.53,133.13 L95.45,135.61 L97.22,138.21 L98.82,140.91 L100.24,143.71 L101.49,146.59 L102.55,149.55 L103.43,152.57 L104.11,155.63 L104.61,158.73 L104.90,161.86 Z"]
+          RenderPath {circle} at (115,5) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M215.00,55.00 L214.90,58.14 L214.61,61.27 L214.11,64.37 L213.43,67.43 L212.55,70.45 L211.49,73.41 L210.24,76.29 L208.82,79.09 L207.22,81.79 L205.45,84.39 L203.53,86.87 L201.45,89.23 L199.23,91.45 L196.87,93.53 L194.39,95.45 L191.79,97.22 L189.09,98.82 L186.29,100.24 L183.41,101.49 L180.45,102.55 L177.43,103.43 L174.37,104.11 L171.27,104.61 L168.14,104.90 L165.00,105.00 L161.86,104.90 L158.73,104.61 L155.63,104.11 L152.57,103.43 L149.55,102.55 L146.59,101.49 L143.71,100.24 L140.91,98.82 L138.21,97.22 L135.61,95.45 L133.13,93.53 L130.77,91.45 L128.55,89.23 L126.47,86.87 L124.55,84.39 L122.78,81.79 L121.18,79.09 L119.76,76.29 L118.51,73.41 L117.45,70.45 L116.57,67.43 L115.89,64.37 L115.39,61.27 L115.10,58.14 L115.00,55.00 L115.10,51.86 L115.39,48.73 L115.89,45.63 L116.57,42.57 L117.45,39.55 L118.51,36.59 L119.76,33.71 L121.18,30.91 L122.78,28.21 L124.55,25.61 L126.47,23.13 L128.55,20.77 L130.77,18.55 L133.13,16.47 L135.61,14.55 L138.21,12.78 L140.91,11.18 L143.71,9.76 L146.59,8.51 L149.55,7.45 L152.57,6.57 L155.63,5.89 L158.73,5.39 L161.86,5.10 L165.00,5.00 L168.14,5.10 L171.27,5.39 L174.37,5.89 L177.43,6.57 L180.45,7.45 L183.41,8.51 L186.29,9.76 L189.09,11.18 L191.79,12.78 L194.39,14.55 L196.87,16.47 L199.23,18.55 L201.45,20.77 L203.53,23.13 L205.45,25.61 L207.22,28.21 L208.82,30.91 L210.24,33.71 L211.49,36.59 L212.55,39.55 L213.43,42.57 L214.11,45.63 L214.61,48.73 L214.90,51.86 Z"]
+          RenderPath {circle} at (115,115) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M215.00,165.00 L214.90,168.14 L214.61,171.27 L214.11,174.37 L213.43,177.43 L212.55,180.45 L211.49,183.41 L210.24,186.29 L208.82,189.09 L207.22,191.79 L205.45,194.39 L203.53,196.87 L201.45,199.23 L199.23,201.45 L196.87,203.53 L194.39,205.45 L191.79,207.22 L189.09,208.82 L186.29,210.24 L183.41,211.49 L180.45,212.55 L177.43,213.43 L174.37,214.11 L171.27,214.61 L168.14,214.90 L165.00,215.00 L161.86,214.90 L158.73,214.61 L155.63,214.11 L152.57,213.43 L149.55,212.55 L146.59,211.49 L143.71,210.24 L140.91,208.82 L138.21,207.22 L135.61,205.45 L133.13,203.53 L130.77,201.45 L128.55,199.23 L126.47,196.87 L124.55,194.39 L122.78,191.79 L121.18,189.09 L119.76,186.29 L118.51,183.41 L117.45,180.45 L116.57,177.43 L115.89,174.37 L115.39,171.27 L115.10,168.14 L115.00,165.00 L115.10,161.86 L115.39,158.73 L115.89,155.63 L116.57,152.57 L117.45,149.55 L118.51,146.59 L119.76,143.71 L121.18,140.91 L122.78,138.21 L124.55,135.61 L126.47,133.13 L128.55,130.77 L130.77,128.55 L133.13,126.47 L135.61,124.55 L138.21,122.78 L140.91,121.18 L143.71,119.76 L146.59,118.51 L149.55,117.45 L152.57,116.57 L155.63,115.89 L158.73,115.39 L161.86,115.10 L165.00,115.00 L168.14,115.10 L171.27,115.39 L174.37,115.89 L177.43,116.57 L180.45,117.45 L183.41,118.51 L186.29,119.76 L189.09,121.18 L191.79,122.78 L194.39,124.55 L196.87,126.47 L199.23,128.55 L201.45,130.77 L203.53,133.13 L205.45,135.61 L207.22,138.21 L208.82,140.91 L210.24,143.71 L211.49,146.59 L212.55,149.55 L213.43,152.57 L214.11,155.63 L214.61,158.73 L214.90,161.86 Z"]
       RenderSVGContainer {g} at (0,0) size 300x300
         RenderSVGContainer {use} at (0,0) size 300x300

trunk/LayoutTests/platform/mac/svg/css/composite-shadow-example-expected.checksum

@@ -1 @@
-e8b39d710acdf5a5718ec8db95472351
+4ef5a950af3759dfbf8d7e9d589aab4e

trunk/LayoutTests/platform/mac/svg/css/composite-shadow-example-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 785x616
     RenderBody {BODY} at (8,8) size 769x600
-      RenderSVGRoot {svg} at (40.19,36.70) size 415.36x128.98
+      RenderSVGRoot {svg} at (40,36) size 425x139
         RenderSVGContainer {g} at (40.19,36.70) size 135.62x128.98
           RenderPath {path} at (40.19,36.70) size 135.62x128.98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]

trunk/LayoutTests/platform/mac/svg/css/composite-shadow-with-opacity-expected.checksum

@@ -1 @@
-3125bf5888684c47c32978f509421c8a
+4d589f98348e648b95472b7ed8c6b621

trunk/LayoutTests/platform/mac/svg/css/composite-shadow-with-opacity-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 769x600
 layer at (8,8) size 769x600
-  RenderSVGRoot {svg} at (40.19,36.70) size 415.36x128.98 [opacity=0.50]
+  RenderSVGRoot {svg} at (40,36) size 425x139 [opacity=0.50]
     RenderSVGContainer {g} at (40.19,36.70) size 135.62x128.98
       RenderPath {path} at (40.19,36.70) size 135.62x128.98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]

trunk/LayoutTests/platform/mac/svg/css/css-box-min-width-expected.checksum

@@ -1 @@
-b2146d7fc85d2c0f085c12d57155f521
+7902a687b944dfbf69779b5f59ffd335

trunk/LayoutTests/platform/mac/svg/css/group-with-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (31.67,31.67) size 253.33x281.67
-    RenderSVGContainer {g} at (31.67,31.67) size 253.33x281.67 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
+  RenderSVGRoot {svg} at (30,30) size 286.67x316.67
+    RenderSVGContainer {g} at (30,30) size 286.67x316.67 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
       RenderPath {line} at (33.33,31.67) size 250x3.33 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#000000]}] [data="M10.00,10.00 L85.00,10.00"]
       RenderPath {rect} at (31.67,65) size 253.33x170 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#800080]}] [data="M10.00,20.00 L85.00,20.00 L85.00,70.00 L10.00,70.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/mask-with-shadow-expected.txt

@@ -11 +11 @@
           RenderSVGGradientStop {stop} at (0,0) size 0x0
         RenderPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#FF0000)]] [start=(0,0)] [end=(1,1)]}] [data="M0.00,0.00 L300.00,0.00 L300.00,300.00 L0.00,300.00 Z"]
-        RenderSVGContainer {mask} at (5,5) size 210x210
+        RenderSVGContainer {mask} at (5,5) size 220x220
           RenderPath {circle} at (5,5) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,55.00 L104.90,58.14 L104.61,61.27 L104.11,64.37 L103.43,67.43 L102.55,70.45 L101.49,73.41 L100.24,76.29 L98.82,79.09 L97.22,81.79 L95.45,84.39 L93.53,86.87 L91.45,89.23 L89.23,91.45 L86.87,93.53 L84.39,95.45 L81.79,97.22 L79.09,98.82 L76.29,100.24 L73.41,101.49 L70.45,102.55 L67.43,103.43 L64.37,104.11 L61.27,104.61 L58.14,104.90 L55.00,105.00 L51.86,104.90 L48.73,104.61 L45.63,104.11 L42.57,103.43 L39.55,102.55 L36.59,101.49 L33.71,100.24 L30.91,98.82 L28.21,97.22 L25.61,95.45 L23.13,93.53 L20.77,91.45 L18.55,89.23 L16.47,86.87 L14.55,84.39 L12.78,81.79 L11.18,79.09 L9.76,76.29 L8.51,73.41 L7.45,70.45 L6.57,67.43 L5.89,64.37 L5.39,61.27 L5.10,58.14 L5.00,55.00 L5.10,51.86 L5.39,48.73 L5.89,45.63 L6.57,42.57 L7.45,39.55 L8.51,36.59 L9.76,33.71 L11.18,30.91 L12.78,28.21 L14.55,25.61 L16.47,23.13 L18.55,20.77 L20.77,18.55 L23.13,16.47 L25.61,14.55 L28.21,12.78 L30.91,11.18 L33.71,9.76 L36.59,8.51 L39.55,7.45 L42.57,6.57 L45.63,5.89 L48.73,5.39 L51.86,5.10 L55.00,5.00 L58.14,5.10 L61.27,5.39 L64.37,5.89 L67.43,6.57 L70.45,7.45 L73.41,8.51 L76.29,9.76 L79.09,11.18 L81.79,12.78 L84.39,14.55 L86.87,16.47 L89.23,18.55 L91.45,20.77 L93.53,23.13 L95.45,25.61 L97.22,28.21 L98.82,30.91 L100.24,33.71 L101.49,36.59 L102.55,39.55 L103.43,42.57 L104.11,45.63 L104.61,48.73 L104.90,51.86 Z"]
           RenderPath {circle} at (5,115) size 100x100 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M105.00,165.00 L104.90,168.14 L104.61,171.27 L104.11,174.37 L103.43,177.43 L102.55,180.45 L101.49,183.41 L100.24,186.29 L98.82,189.09 L97.22,191.79 L95.45,194.39 L93.53,196.87 L91.45,199.23 L89.23,201.45 L86.87,203.53 L84.39,205.45 L81.79,207.22 L79.09,208.82 L76.29,210.24 L73.41,211.49 L70.45,212.55 L67.43,213.43 L64.37,214.11 L61.27,214.61 L58.14,214.90 L55.00,215.00 L51.86,214.90 L48.73,214.61 L45.63,214.11 L42.57,213.43 L39.55,212.55 L36.59,211.49 L33.71,210.24 L30.91,208.82 L28.21,207.22 L25.61,205.45 L23.13,203.53 L20.77,201.45 L18.55,199.23 L16.47,196.87 L14.55,194.39 L12.78,191.79 L11.18,189.09 L9.76,186.29 L8.51,183.41 L7.45,180.45 L6.57,177.43 L5.89,174.37 L5.39,171.27 L5.10,168.14 L5.00,165.00 L5.10,161.86 L5.39,158.73 L5.89,155.63 L6.57,152.57 L7.45,149.55 L8.51,146.59 L9.76,143.71 L11.18,140.91 L12.78,138.21 L14.55,135.61 L16.47,133.13 L18.55,130.77 L20.77,128.55 L23.13,126.47 L25.61,124.55 L28.21,122.78 L30.91,121.18 L33.71,119.76 L36.59,118.51 L39.55,117.45 L42.57,116.57 L45.63,115.89 L48.73,115.39 L51.86,115.10 L55.00,115.00 L58.14,115.10 L61.27,115.39 L64.37,115.89 L67.43,116.57 L70.45,117.45 L73.41,118.51 L76.29,119.76 L79.09,121.18 L81.79,122.78 L84.39,124.55 L86.87,126.47 L89.23,128.55 L91.45,130.77 L93.53,133.13 L95.45,135.61 L97.22,138.21 L98.82,140.91 L100.24,143.71 L101.49,146.59 L102.55,149.55 L103.43,152.57 L104.11,155.63 L104.61,158.73 L104.90,161.86 Z"]

trunk/LayoutTests/platform/mac/svg/css/path-with-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (200,200) size 100x200
-    RenderPath {path} at (200,200) size 100x200 [fill={[type=SOLID] [color=#0000FF]}] [data="M200.00,200.00 L300.00,200.00 L300.00,400.00 L200.00,400.00 Z"]
+  RenderSVGRoot {svg} at (200,200) size 110x210
+    RenderPath {path} at (200,200) size 110x210 [fill={[type=SOLID] [color=#0000FF]}] [data="M200.00,200.00 L300.00,200.00 L300.00,400.00 L200.00,400.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (100,100) size 200x200
-    RenderPath {rect} at (100,100) size 200x200 [opacity=0.50] [fill={[type=SOLID] [color=#008000]}] [data="M100.00,100.00 L300.00,100.00 L300.00,300.00 L100.00,300.00 Z"]
+  RenderSVGRoot {svg} at (87,87) size 213x213
+    RenderPath {rect} at (87,87) size 213x213 [opacity=0.50] [fill={[type=SOLID] [color=#008000]}] [data="M100.00,100.00 L300.00,100.00 L300.00,300.00 L100.00,300.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/shadow-with-large-radius-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (95,95) size 110x110
-    RenderPath {path} at (95,95) size 110x110 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M100.00,100.00 L200.00,100.00 L200.00,200.00 L100.00,200.00 Z"]
+  RenderSVGRoot {svg} at (50,50) size 210x210
+    RenderPath {path} at (50,50) size 210x210 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M100.00,100.00 L200.00,100.00 L200.00,200.00 L100.00,200.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/shadow-with-negative-offset-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (95,95) size 110x110
-    RenderPath {path} at (95,95) size 110x110 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M100.00,100.00 L200.00,100.00 L200.00,200.00 L100.00,200.00 Z"]
+  RenderSVGRoot {svg} at (40,40) size 210x210
+    RenderPath {path} at (40,40) size 210x210 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M100.00,100.00 L200.00,100.00 L200.00,200.00 L100.00,200.00 Z"]

trunk/LayoutTests/platform/mac/svg/css/stars-with-shadow-expected.checksum

@@ -1 @@
-de73673c1e37edf6d9f7f141bdf10bd0
+88dda410fd6a94eb7fff89c498722aa6

trunk/LayoutTests/platform/mac/svg/css/stars-with-shadow-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 785x616
     RenderBody {BODY} at (8,8) size 769x600
-      RenderSVGRoot {svg} at (40.19,36.70) size 426.11x128.98
-        RenderPath {path} at (40.19,36.70) size 135.62x128.98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
-        RenderPath {path} at (190.19,36.70) size 135.62x128.98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
-        RenderPath {path} at (349.70,46.70) size 116.60x110.89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(400.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,25.00 L-29.39,40.45 L-23.78,7.73 L-47.55,-15.45 L-14.69,-20.23 L-0.00,-50.00 L14.69,-20.23 L47.55,-15.45 L23.78,7.73 L29.39,40.45 Z"]
+      RenderSVGRoot {svg} at (41,37) size 435x138
+        RenderPath {path} at (41,37) size 144x138 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+        RenderPath {path} at (191,37) size 144x138 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L-0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+        RenderPath {path} at (350,47) size 126x120 [transform={m=((1.00,0.00)(0.00,1.00)) t=(400.00,100.00)}] [stroke={[type=SOLID] [color=#800080] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,25.00 L-29.39,40.45 L-23.78,7.73 L-47.55,-15.45 L-14.69,-20.23 L-0.00,-50.00 L14.69,-20.23 L47.55,-15.45 L23.78,7.73 L29.39,40.45 Z"]

trunk/LayoutTests/platform/mac/svg/filters/shadow-on-rect-with-filter-expected.checksum

@@ -1 @@
-c2f1aa1ba34ce5d2a4217daa9002179e
+424817e7f7582a23a5b96720c7c03cfc

trunk/LayoutTests/platform/mac/svg/filters/shadow-on-rect-with-filter-expected.txt

@@ -3 +3 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (50,50) size 480x480
+  RenderSVGRoot {svg} at (37,37) size 493x493
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-    RenderPath {rect} at (50,50) size 480x480 [fill={[type=SOLID] [color=#008000]}] [filter=filter] [data="M200.00,200.00 L500.00,200.00 L500.00,500.00 L200.00,500.00 Z"]
+    RenderPath {rect} at (37,37) size 493x493 [fill={[type=SOLID] [color=#008000]}] [filter=filter] [data="M200.00,200.00 L500.00,200.00 L500.00,500.00 L200.00,500.00 Z"]

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-14  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=33498 REGRESSION: 
+        svg/css/circle-in-mask-with-shadow.svg failing pixel tests
+        -and corresponding-
+        <rdar://problem/7544176>
+
+        This change makes repaintRectInLocalCoordinates return a rect that 
+        is -webkit-svg-shadow-aware.
+
+        * rendering/RenderPath.cpp:
+        (WebCore::RenderPath::repaintRectInLocalCoordinates):
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::repaintRectInLocalCoordinates):
+        * rendering/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::repaintRectInLocalCoordinates):
+        * rendering/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::repaintRectInLocalCoordinates):
+        * rendering/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::repaintRectInLocalCoordinates):
+        * rendering/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderBase::prepareToRenderSVGContent):
+        * rendering/style/SVGRenderStyle.cpp:
+        (WebCore::SVGRenderStyle::inflateForShadow):
+        * rendering/style/SVGRenderStyle.h:
+
 2010-01-14  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/rendering/RenderPath.cpp

@@ -169 +169 @@
         m_cachedLocalRepaintRect.intersect(rect);
 
+    style()->svgStyle()->inflateForShadow(m_cachedLocalRepaintRect);
+
     return m_cachedLocalRepaintRect;
 }

trunk/WebCore/rendering/RenderSVGContainer.cpp

@@ -160 +160 @@
         repaintRect.intersect(rect);
 
+    style()->svgStyle()->inflateForShadow(repaintRect);
+
     return repaintRect;
 }

trunk/WebCore/rendering/RenderSVGImage.cpp

@@ -160 +160 @@
         m_cachedLocalRepaintRect.intersect(rect);
 
+    style()->svgStyle()->inflateForShadow(m_cachedLocalRepaintRect);
+
     return m_cachedLocalRepaintRect;
 }

trunk/WebCore/rendering/RenderSVGRoot.cpp

@@ -249 +249 @@
 FloatRect RenderSVGRoot::repaintRectInLocalCoordinates() const
 {
-    // FIXME: This does not include the border or shadow but it should!
-    return computeContainerBoundingBox(this, true);
+    // FIXME: This does not include the border but it should!
+    FloatRect repaintRect = computeContainerBoundingBox(this, true);
+    style()->svgStyle()->inflateForShadow(repaintRect);
+    return repaintRect;
 }
 

trunk/WebCore/rendering/RenderSVGText.cpp

@@ -229 +229 @@
         repaintRect.intersect(rect);
 
+    style()->svgStyle()->inflateForShadow(repaintRect);
+
     return repaintRect;
 }

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(repaintIntRectWithShadow);
+        paintInfo.context->clip(repaintRect);
         paintInfo.context->beginTransparencyLayer(opacity);
     }
 
-    if (shadow) {
-        paintInfo.context->clip(repaintIntRectWithShadow);
+    if (ShadowData* shadow = svgStyle->shadow()) {
+        paintInfo.context->clip(repaintRect);
         paintInfo.context->setShadow(IntSize(shadow->x, shadow->y), shadow->blur, shadow->color, style->colorSpace());
         paintInfo.context->beginTransparencyLayer(1.0f);

trunk/WebCore/rendering/style/SVGRenderStyle.cpp

@@ -167 +167 @@
         return;
 
+    FloatRect repaintFloatRect = FloatRect(repaintRect);
+    inflateForShadow(repaintFloatRect);
+    repaintRect = enclosingIntRect(repaintFloatRect);
+}
+
+void SVGRenderStyle::inflateForShadow(FloatRect& repaintRect) const
+{
+    ShadowData* svgShadow = shadow();
+    if (!svgShadow)
+        return;
+
     int shadowTop;
     int shadowRight;

trunk/WebCore/rendering/style/SVGRenderStyle.h

@@ -35 +35 @@
 namespace WebCore {
 
+    class FloatRect;
+    class IntRect;
     class RenderObject;
     class RenderStyle;
-    class IntRect;
 
     class SVGRenderStyle : public RefCounted<SVGRenderStyle> {    
@@ -48 +49 @@
         void inheritFrom(const SVGRenderStyle*);
 
+        // FIXME: These functions should move to ShadowData.
         void inflateForShadow(IntRect&) const;
+        void inflateForShadow(FloatRect&) const;
         
         bool operator==(const SVGRenderStyle&) const;