Changeset 148049 in webkit

Timestamp:

Apr 9, 2013 1:52:55 PM (11 years ago)

Author:

Simon Fraser

Message:

Repaint rect too small on elements with shadows
​https://bugs.webkit.org/show_bug.cgi?id=114225

Source/WebCore:

Reviewed by Dain Adler.

We assumed that shadows (box-shadow, text-shadow, svg shadows)
only required inflating the repaint rect by the blur radius of
the shadow. However, this is incorrect; the shadow can extend
further, which resulted in clipped or incorrectly invalidated
shadows.

Fix by disambiguating the blur radius (which is 2x the standard
deviation of the Gaussian distribution used to generate the blur),
from the painting extent, which is how far the shadow visually
projects. Using a 1.4 multiplier of the blur radius is a good
approximation for the painting extent.

Renamed ShadowData::blur() to ShadowData::radius(), and added
ShadowData::paintingExtent(). Use the latter in all places
which relate to invalidation.

Test: fast/box-shadow/shadow-repaint.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::valueForShadow):

• editing/mac/EditorMac.mm:

(WebCore::Editor::fontAttributesForSelectionStart):

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::paint):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::applyShadowToGraphicsContext):
(WebCore::InlineTextBox::paintDecoration):

• rendering/RenderBoxModelObject.cpp:

(WebCore::applyBoxShadowForBackground):
(WebCore::areaCastingShadowInHole):
(WebCore::RenderBoxModelObject::paintBoxShadow):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::getShadowExtent):
(WebCore::RenderStyle::getShadowInsetExtent):
(WebCore::RenderStyle::getShadowHorizontalExtent):
(WebCore::RenderStyle::getShadowVerticalExtent):

• rendering/style/ShadowData.cpp:

(WebCore::ShadowData::ShadowData):
(WebCore::ShadowData::operator==):
(WebCore::calculateShadowExtent):

• rendering/style/ShadowData.h:

(WebCore::ShadowData::ShadowData):
(WebCore::ShadowData::radius):
(WebCore::ShadowData::paintingExtent):

• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::prepareToRenderSVGContent):

LayoutTests:

Reviewed by Darin Alder.

New test for invalidation with box-shadow. Update test results affected
by shadow extent.

• compositing/geometry/foreground-layer-expected.txt:
• compositing/iframes/composited-parent-iframe-expected.txt:
• compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
• compositing/iframes/connect-compositing-iframe-expected.txt:
• compositing/iframes/connect-compositing-iframe2-expected.txt:
• compositing/iframes/connect-compositing-iframe3-expected.txt:
• compositing/iframes/enter-compositing-iframe-expected.txt:
• compositing/iframes/iframe-resize-expected.txt:
• compositing/iframes/invisible-nested-iframe-show-expected.txt:
• compositing/iframes/overlapped-iframe-expected.txt:
• compositing/iframes/page-cache-layer-tree-expected.txt:
• compositing/iframes/scrolling-iframe-expected.txt:
• compositing/visible-rect/iframe-and-layers-expected.txt:
• fast/box-shadow/shadow-repaint-expected.txt: Added.
• fast/box-shadow/shadow-repaint.html: Added.
• platform/mac/fast/multicol/shadow-breaking-expected.png:
• platform/mac/fast/multicol/shadow-breaking-expected.txt:
• platform/mac/fast/repaint/moving-shadow-on-container-expected.txt:
• 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/circle-in-mask-with-shadow-expected.png:
• platform/mac/svg/css/clippath-with-shadow-expected.png:
• platform/mac/svg/css/composite-shadow-example-expected.png:
• platform/mac/svg/css/composite-shadow-example-expected.txt:
• platform/mac/svg/css/composite-shadow-text-expected.txt:
• platform/mac/svg/css/composite-shadow-with-opacity-expected.png:
• platform/mac/svg/css/composite-shadow-with-opacity-expected.txt:
• platform/mac/svg/css/group-with-shadow-expected.png:
• platform/mac/svg/css/group-with-shadow-expected.txt:
• platform/mac/svg/css/mask-with-shadow-expected.png:
• 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.png:
• platform/mac/svg/css/shadow-and-opacity-expected.txt:
• platform/mac/svg/css/shadow-changes-expected.png:
• platform/mac/svg/css/shadow-changes-expected.txt:
• platform/mac/svg/css/shadow-with-large-radius-expected.png:
• platform/mac/svg/css/shadow-with-negative-offset-expected.png:
• platform/mac/svg/css/stars-with-shadow-expected.png:
• platform/mac/svg/css/stars-with-shadow-expected.txt:
• platform/mac/svg/css/text-gradient-shadow-expected.png:
• platform/mac/svg/css/text-gradient-shadow-expected.txt:
• platform/mac/svg/css/text-shadow-multiple-expected.png:
• platform/mac/svg/custom/repaint-shadow-expected.png:
• platform/mac/svg/custom/transform-with-shadow-and-gradient-expected.txt:
• svg/css/arrow-with-shadow-expected.txt:
• svg/css/circle-in-mask-with-shadow-expected.txt:
• svg/css/clippath-with-shadow-expected.txt:
• svg/css/mask-with-shadow-expected.txt:
• svg/css/shadow-with-large-radius-expected.txt:
• svg/css/shadow-with-negative-offset-expected.txt:
• svg/css/text-shadow-multiple-expected.txt:
• svg/custom/repaint-shadow-expected.txt:
• svg/filters/shadow-on-rect-with-filter-expected.txt:
• svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/geometry/foreground-layer-expected.txt (modified) (2 diffs)
• LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/iframe-resize-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/overlapped-iframe-expected.txt (modified) (1 diff)
• LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt (modified) (2 diffs)
• LayoutTests/compositing/iframes/scrolling-iframe-expected.txt (modified) (1 diff)
• LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt (modified) (1 diff)
• LayoutTests/fast/box-shadow/shadow-repaint-expected.txt (added)
• LayoutTests/fast/box-shadow/shadow-repaint.html (added)
• LayoutTests/platform/mac/fast/multicol/shadow-breaking-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/multicol/shadow-breaking-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/fast/repaint/moving-shadow-on-container-expected.txt (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/circle-in-mask-with-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/clippath-with-shadow-expected.png (modified) (previous)
• 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-text-expected.txt (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/group-with-shadow-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.png (modified) (previous)
• 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.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/shadow-and-opacity-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-changes-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/shadow-changes-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/shadow-with-large-radius-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/shadow-with-negative-offset-expected.png (modified) (previous)
• 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/css/text-gradient-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/css/text-gradient-shadow-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/text-shadow-multiple-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/custom/repaint-shadow-expected.png (modified) (previous)
• LayoutTests/platform/mac/svg/custom/transform-with-shadow-and-gradient-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/arrow-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/circle-in-mask-with-shadow-expected.txt (modified) (2 diffs)
• LayoutTests/svg/css/clippath-with-shadow-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/mask-with-shadow-expected.txt (modified) (2 diffs)
• LayoutTests/svg/css/shadow-with-large-radius-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/shadow-with-negative-offset-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/text-shadow-multiple-expected.txt (modified) (1 diff)
• LayoutTests/svg/custom/repaint-shadow-expected.txt (modified) (1 diff)
• LayoutTests/svg/filters/shadow-on-rect-with-filter-expected.txt (modified) (2 diffs)
• LayoutTests/svg/repaint/repaint-webkit-svg-shadow-container-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/editing/mac/EditorMac.mm (modified) (1 diff)
• Source/WebCore/page/animation/CSSPropertyAnimation.cpp (modified) (1 diff)
• Source/WebCore/rendering/EllipsisBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (8 diffs)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (4 diffs)
• Source/WebCore/rendering/style/ShadowData.cpp (modified) (3 diffs)
• Source/WebCore/rendering/style/ShadowData.h (modified) (4 diffs)
• Source/WebCore/rendering/svg/SVGRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-09  Simon Fraser  <simon.fraser@apple.com>
+
+        Repaint rect too small on elements with shadows
+        https://bugs.webkit.org/show_bug.cgi?id=114225
+
+        Reviewed by Darin Alder.
+        
+        New test for invalidation with box-shadow. Update test results affected
+        by shadow extent.
+
+        * compositing/geometry/foreground-layer-expected.txt:
+        * compositing/iframes/composited-parent-iframe-expected.txt:
+        * compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
+        * compositing/iframes/connect-compositing-iframe-expected.txt:
+        * compositing/iframes/connect-compositing-iframe2-expected.txt:
+        * compositing/iframes/connect-compositing-iframe3-expected.txt:
+        * compositing/iframes/enter-compositing-iframe-expected.txt:
+        * compositing/iframes/iframe-resize-expected.txt:
+        * compositing/iframes/invisible-nested-iframe-show-expected.txt:
+        * compositing/iframes/overlapped-iframe-expected.txt:
+        * compositing/iframes/page-cache-layer-tree-expected.txt:
+        * compositing/iframes/scrolling-iframe-expected.txt:
+        * compositing/visible-rect/iframe-and-layers-expected.txt:
+        * fast/box-shadow/shadow-repaint-expected.txt: Added.
+        * fast/box-shadow/shadow-repaint.html: Added.
+        * platform/mac/fast/multicol/shadow-breaking-expected.png:
+        * platform/mac/fast/multicol/shadow-breaking-expected.txt:
+        * platform/mac/fast/repaint/moving-shadow-on-container-expected.txt:
+        * 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/circle-in-mask-with-shadow-expected.png:
+        * platform/mac/svg/css/clippath-with-shadow-expected.png:
+        * platform/mac/svg/css/composite-shadow-example-expected.png:
+        * platform/mac/svg/css/composite-shadow-example-expected.txt:
+        * platform/mac/svg/css/composite-shadow-text-expected.txt:
+        * platform/mac/svg/css/composite-shadow-with-opacity-expected.png:
+        * platform/mac/svg/css/composite-shadow-with-opacity-expected.txt:
+        * platform/mac/svg/css/group-with-shadow-expected.png:
+        * platform/mac/svg/css/group-with-shadow-expected.txt:
+        * platform/mac/svg/css/mask-with-shadow-expected.png:
+        * 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.png:
+        * platform/mac/svg/css/shadow-and-opacity-expected.txt:
+        * platform/mac/svg/css/shadow-changes-expected.png:
+        * platform/mac/svg/css/shadow-changes-expected.txt:
+        * platform/mac/svg/css/shadow-with-large-radius-expected.png:
+        * platform/mac/svg/css/shadow-with-negative-offset-expected.png:
+        * platform/mac/svg/css/stars-with-shadow-expected.png:
+        * platform/mac/svg/css/stars-with-shadow-expected.txt:
+        * platform/mac/svg/css/text-gradient-shadow-expected.png:
+        * platform/mac/svg/css/text-gradient-shadow-expected.txt:
+        * platform/mac/svg/css/text-shadow-multiple-expected.png:
+        * platform/mac/svg/custom/repaint-shadow-expected.png:
+        * platform/mac/svg/custom/transform-with-shadow-and-gradient-expected.txt:
+        * svg/css/arrow-with-shadow-expected.txt:
+        * svg/css/circle-in-mask-with-shadow-expected.txt:
+        * svg/css/clippath-with-shadow-expected.txt:
+        * svg/css/mask-with-shadow-expected.txt:
+        * svg/css/shadow-with-large-radius-expected.txt:
+        * svg/css/shadow-with-negative-offset-expected.txt:
+        * svg/css/text-shadow-multiple-expected.txt:
+        * svg/custom/repaint-shadow-expected.txt:
+        * svg/filters/shadow-on-rect-with-filter-expected.txt:
+        * svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:
+
 2013-04-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/LayoutTests/compositing/geometry/foreground-layer-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 18.00 18.00)
-          (bounds 320.00 320.00)
+          (position 10.00 10.00)
+          (bounds 336.00 336.00)
           (drawsContent 1)
           (children 2
             (GraphicsLayer
-              (position 60.00 60.00)
+              (position 68.00 68.00)
               (bounds 50.00 50.00)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
             (GraphicsLayer
-              (bounds 320.00 320.00)
+              (bounds 336.00 336.00)
               (drawsContent 1)
             )
@@ -24 +24 @@
         )
         (GraphicsLayer
-          (position 362.00 18.00)
-          (bounds 320.00 320.00)
+          (position 354.00 10.00)
+          (bounds 336.00 336.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 60.00 60.00)
+              (position 68.00 68.00)
               (bounds 200.00 200.00)
               (children 2

trunk/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt

@@ -8 +8 @@
       (children 1
         (GraphicsLayer
-          (position -12.00 -12.00)
-          (bounds 370.00 220.00)
+          (position -20.00 -20.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt

@@ -10 +10 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 108.00)
-          (bounds 370.00 220.00)
+          (position 0.00 100.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt

@@ -8 +8 @@
       (children 1
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/iframe-resize-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 470.00 190.00)
+          (bounds 486.00 206.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (bounds 358.00 208.00)
+          (bounds 366.00 216.00)
           (drawsContent 1)
           (children 1

trunk/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt

@@ -14 +14 @@
       (children 4
         (GraphicsLayer
-          (position 8.00 50.00)
-          (bounds 370.00 220.00)
+          (position 0.00 42.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer
@@ -58 +58 @@
         (GraphicsLayer
           (position 8.00 274.00)
-          (bounds 370.00 220.00)
+          (bounds 784.00 224.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position -8.00 -8.00)
+              (bounds 386.00 236.00)
+              (drawsContent 1)
               (children 1
                 (GraphicsLayer
-                  (bounds 285.00 135.00)
+                  (position 43.00 43.00)
                   (children 1
                     (GraphicsLayer
+                      (bounds 285.00 135.00)
                       (children 1
                         (GraphicsLayer
-                          (bounds 508.00 608.00)
                           (children 1
                             (GraphicsLayer
                               (bounds 508.00 608.00)
-                              (drawsContent 1)
                               (children 1
                                 (GraphicsLayer
-                                  (position 108.00 100.00)
-                                  (bounds 200.00 200.00)
-                                  (contentsOpaque 1)
+                                  (bounds 508.00 608.00)
+                                  (drawsContent 1)
+                                  (children 1
+                                    (GraphicsLayer
+                                      (position 108.00 100.00)
+                                      (bounds 200.00 200.00)
+                                      (contentsOpaque 1)
+                                    )
+                                  )
                                 )
                               )

trunk/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt

@@ -8 +8 @@
       (children 2
         (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 370.00 220.00)
+          (bounds 386.00 236.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 35.00 35.00)
+              (position 43.00 43.00)
               (children 1
                 (GraphicsLayer

trunk/LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt

@@ -10 +10 @@
       (children 2
         (GraphicsLayer
-          (position 18.00 18.00)
-          (bounds 344.00 194.00)
+          (position 10.00 10.00)
+          (bounds 360.00 210.00)
           (drawsContent 1)
-          (visible rect 0.00, 0.00 344.00 x 194.00)
+          (visible rect 0.00, 0.00 360.00 x 210.00)
           (children 1
             (GraphicsLayer
-              (position 22.00 22.00)
+              (position 30.00 30.00)
               (visible rect 0.00, 0.00 0.00 x 0.00)
               (children 1

trunk/LayoutTests/platform/mac/fast/multicol/shadow-breaking-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 784x0
       RenderBlock {DIV} at (0,0) size 784x0
-layer at (20,36) size 424x270
-  RenderBlock (positioned) {P} at (20,36) size 424x270 [border: (2px solid #000000)]
+layer at (20,36) size 424x272
+  RenderBlock (positioned) {P} at (20,36) size 424x272 [border: (2px solid #000000)]
     RenderBlock (floating) at (2,2) size 24x41
       RenderText {#text} at (0,0) size 24x41
         text run at (0,0) width 24: "L"
-    RenderText {#text} at (30,2) size 200x491
+    RenderText {#text} at (30,2) size 200x497
       text run at (30,2) width 172: "orem ipsum dolor sit"
       text run at (30,20) width 172: "amet, consectetur"
@@ -25 +25 @@
       text run at (2,218) width 200: "Nam non ligula massa, sed"
       text run at (2,236) width 200: "suscipit turpis. Etiam eget"
-      text run at (2,277) width 200: "ligula sit amet turpis"
-      text run at (2,295) width 200: "venenatis dictum in eleifend"
-      text run at (2,313) width 200: "augue. Duis tellus lectus,"
-      text run at (2,331) width 200: "volutpat et adipiscing a,"
-      text run at (2,349) width 200: "pellentesque eu metus."
-      text run at (2,367) width 200: "Aenean suscipit congue"
-      text run at (2,385) width 200: "mauris at gravida. Integer"
-      text run at (2,403) width 200: "lectus ligula, consectetur sit"
-      text run at (2,421) width 200: "amet venenatis id, scelerisque"
-      text run at (2,439) width 200: "eget nisl. Nunc dapibus"
-      text run at (2,457) width 200: "posuere risus, vitae tempor"
-      text run at (2,475) width 97: "nibh iaculis et."
+      text run at (2,283) width 200: "ligula sit amet turpis"
+      text run at (2,301) width 200: "venenatis dictum in eleifend"
+      text run at (2,319) width 200: "augue. Duis tellus lectus,"
+      text run at (2,337) width 200: "volutpat et adipiscing a,"
+      text run at (2,355) width 200: "pellentesque eu metus."
+      text run at (2,373) width 200: "Aenean suscipit congue"
+      text run at (2,391) width 200: "mauris at gravida. Integer"
+      text run at (2,409) width 200: "lectus ligula, consectetur sit"
+      text run at (2,427) width 200: "amet venenatis id, scelerisque"
+      text run at (2,445) width 200: "eget nisl. Nunc dapibus"
+      text run at (2,463) width 200: "posuere risus, vitae tempor"
+      text run at (2,481) width 97: "nibh iaculis et."

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 (8,8) size 488x193
-        RenderSVGPath {path} at (8,8) size 78x68 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (200,46) size 128x125 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (349,46) size 117x122 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]
+      RenderSVGRoot {svg} at (8,8) size 496x201
+        RenderSVGPath {path} at (8,8) size 80x70 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (198,44) size 132x129 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (347,44) size 121x126 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]

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 (8,8) size 458x163
-        RenderSVGPath {path} at (8,8) size 88x78 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (200,46) size 138x135 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (349,46) size 127x132 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]
+      RenderSVGRoot {svg} at (8,8) size 460x165
+        RenderSVGPath {path} at (8,8) size 92x82 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (196,42) size 146x143 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (345,42) size 135x140 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]

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,36) size 456x170
-        RenderSVGContainer {g} at (40,36) size 156x150
-          RenderSVGPath {path} at (40,36) size 146x140 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGContainer {g} at (200,46) size 138x135
-          RenderSVGPath {path} at (200,46) size 128x125 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGContainer {g} at (349,46) size 127x132
-          RenderSVGPath {path} at (349,46) size 117x122 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]
+      RenderSVGRoot {svg} at (32,28) size 472x186
+        RenderSVGContainer {g} at (36,32) size 164x158
+          RenderSVGPath {path} at (38,34) size 150x144 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGContainer {g} at (196,42) size 146x143
+          RenderSVGPath {path} at (198,44) size 132x129 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGContainer {g} at (345,42) size 135x140
+          RenderSVGPath {path} at (347,44) size 121x126 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]

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

@@ -10 +10 @@
         RenderSVGRect {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
         RenderSVGRect {rect} at (0,10) size 10x10 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
-    RenderSVGContainer {g} at (9,9) size 245x427
+    RenderSVGContainer {g} at (9,9) size 249x431
       RenderSVGText {text} at (10,10) size 183x115 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 183x115

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,36) size 456x170 [opacity=0.50]
-    RenderSVGContainer {g} at (40,36) size 156x150
-      RenderSVGPath {path} at (40,36) size 146x140 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-    RenderSVGContainer {g} at (200,46) size 138x135
-      RenderSVGPath {path} at (200,46) size 128x125 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-    RenderSVGContainer {g} at (349,46) size 127x132
-      RenderSVGPath {path} at (349,46) size 117x122 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]
+  RenderSVGRoot {svg} at (32,28) size 472x186 [opacity=0.50]
+    RenderSVGContainer {g} at (36,32) size 164x158
+      RenderSVGPath {path} at (38,34) size 150x144 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+    RenderSVGContainer {g} at (196,42) size 146x143
+      RenderSVGPath {path} at (198,44) size 132x129 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+    RenderSVGContainer {g} at (345,42) size 135x140
+      RenderSVGPath {path} at (347,44) size 121x126 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]

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 (30,31) size 289x286
-    RenderSVGContainer {g} at (30,31) size 355x353 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
-      RenderSVGPath {line} at (33,31) size 284x38 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#000000]}] [x1=10.00] [y1=10.00] [x2=85.00] [y2=10.00]
-      RenderSVGRect {rect} at (31,65) size 288x204 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#800080]}] [x=10.00] [y=20.00] [width=75.00] [height=50.00]
+  RenderSVGRoot {svg} at (25,25) size 300x292
+    RenderSVGContainer {g} at (11,11) size 394x386 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
+      RenderSVGPath {line} at (26,25) size 298x50 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#000000]}] [x1=10.00] [y1=10.00] [x2=85.00] [y2=10.00]
+      RenderSVGRect {rect} at (25,58) size 300x217 [stroke={[type=SOLID] [color=#800080]}] [fill={[type=SOLID] [color=#800080]}] [x=10.00] [y=20.00] [width=75.00] [height=50.00]
       RenderSVGText {text} at (10,75) size 78x19 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 78x19

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 110x210
-    RenderSVGPath {path} at (200,200) size 120x220 [fill={[type=SOLID] [color=#0000FF]}] [data="M 200 200 L 300 200 L 300 400 L 200 400 Z"]
+  RenderSVGRoot {svg} at (198,198) size 114x214
+    RenderSVGPath {path} at (196,196) size 128x228 [fill={[type=SOLID] [color=#0000FF]}] [data="M 200 200 L 300 200 L 300 400 L 200 400 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 (87,87) size 213x213
-    RenderSVGRect {rect} at (74,74) size 226x226 [opacity=0.50] [fill={[type=SOLID] [color=#008000]}] [x=100.00] [y=100.00] [width=200.00] [height=200.00]
+  RenderSVGRoot {svg} at (85,85) size 215x215
+    RenderSVGRect {rect} at (70,70) size 230x230 [opacity=0.50] [fill={[type=SOLID] [color=#008000]}] [x=100.00] [y=100.00] [width=200.00] [height=200.00]

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

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (135,5) size 326x285
-    RenderSVGContainer {g} at (105,0) size 356x290
-      RenderSVGRect {rect} at (135,5) size 215x215 [fill={[type=SOLID] [color=#FF0000]}] [x=150.00] [y=20.00] [width=200.00] [height=200.00]
-      RenderSVGEllipse {circle} at (205,75) size 215x215 [fill={[type=SOLID] [color=#0000FF]}] [cx=320.00] [cy=190.00] [r=100.00]
+  RenderSVGRoot {svg} at (132,2) size 329x288
+    RenderSVGContainer {g} at (96,0) size 365x290
+      RenderSVGRect {rect} at (132,2) size 218x218 [fill={[type=SOLID] [color=#FF0000]}] [x=150.00] [y=20.00] [width=200.00] [height=200.00]
+      RenderSVGEllipse {circle} at (202,72) size 218x218 [fill={[type=SOLID] [color=#0000FF]}] [cx=320.00] [cy=190.00] [r=100.00]
       RenderSVGText {text} at (270,36) size 191x108 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 191x107

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,36) size 437x140
-        RenderSVGPath {path} at (40,36) size 156x150 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (190,36) size 156x150 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
-        RenderSVGPath {path} at (349,46) size 138x132 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]
+      RenderSVGRoot {svg} at (38,34) size 441x144
+        RenderSVGPath {path} at (36,32) size 164x158 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (186,32) size 164x158 [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="M 1.83697e-15 30 L -35.2671 48.541 L -28.5317 9.27051 L -57.0634 -18.541 L -17.6336 -24.2705 L -1.10218e-14 -60 L 17.6336 -24.2705 L 57.0634 -18.541 L 28.5317 9.27051 L 35.2671 48.541 Z"]
+        RenderSVGPath {path} at (345,42) size 146x140 [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="M 1.53081e-15 25 L -29.3893 40.4509 L -23.7764 7.72542 L -47.5528 -15.4508 L -14.6946 -20.2254 L -9.18485e-15 -50 L 14.6946 -20.2254 L 47.5528 -15.4508 L 23.7764 7.72542 L 29.3893 40.4509 Z"]

trunk/LayoutTests/platform/mac/svg/css/text-gradient-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (200,20) size 439x270
+  RenderSVGRoot {svg} at (192,12) size 455x286
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGResourceLinearGradient {linearGradient} [id="gradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]

trunk/LayoutTests/platform/mac/svg/custom/transform-with-shadow-and-gradient-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (18,16) size 542x544
+  RenderSVGRoot {svg} at (14,0) size 578x592
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGResourceLinearGradient {linearGradient} [id="gradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
         RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
         RenderSVGGradientStop {stop} [offset=1.00] [color=#008000]
-    RenderSVGEllipse {circle} at (20,20) size 176x176 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] [fill={[type=LINEAR-GRADIENT] [id="gradient"]}] [cx=25.00] [cy=25.00] [r=20.00]
-    RenderSVGRect {rect} at (320,16) size 288x288 [transform={m=((32.00,0.00)(0.00,32.00)) t=(0.00,0.00)}] [fill={[type=LINEAR-GRADIENT] [id="gradient"]}] [x=10.00] [y=0.50] [width=5.00] [height=5.00]
-    RenderSVGEllipse {circle} at (18,318) size 180x180 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] [stroke={[type=LINEAR-GRADIENT] [id="gradient"]}] [fill={[type=SOLID] [color=#00000000]}] [cx=25.00] [cy=100.00] [r=20.00]
-    RenderSVGRect {rect} at (304,304) size 320x296 [transform={m=((32.00,0.00)(0.00,32.00)) t=(0.00,0.00)}] [stroke={[type=LINEAR-GRADIENT] [id="gradient"]}] [fill={[type=SOLID] [color=#00000000]}] [x=10.00] [y=10.00] [width=5.00] [height=5.00]
+    RenderSVGEllipse {circle} at (12,12) size 192x192 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] [fill={[type=LINEAR-GRADIENT] [id="gradient"]}] [cx=25.00] [cy=25.00] [r=20.00]
+    RenderSVGRect {rect} at (256,0) size 416x368 [transform={m=((32.00,0.00)(0.00,32.00)) t=(0.00,0.00)}] [fill={[type=LINEAR-GRADIENT] [id="gradient"]}] [x=10.00] [y=0.50] [width=5.00] [height=5.00]
+    RenderSVGEllipse {circle} at (10,310) size 196x196 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] [stroke={[type=LINEAR-GRADIENT] [id="gradient"]}] [fill={[type=SOLID] [color=#00000000]}] [cx=25.00] [cy=100.00] [r=20.00]
+    RenderSVGRect {rect} at (240,240) size 448x360 [transform={m=((32.00,0.00)(0.00,32.00)) t=(0.00,0.00)}] [stroke={[type=LINEAR-GRADIENT] [id="gradient"]}] [fill={[type=SOLID] [color=#00000000]}] [x=10.00] [y=10.00] [width=5.00] [height=5.00]

trunk/LayoutTests/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,23) size 605x414
-    RenderSVGContainer {g} at (79,23) size 671x480 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
-      RenderSVGContainer {a} at (79,23) size 638x447
-        RenderSVGPath {path} at (79,23) size 605x414 [stroke={[type=SOLID] [color=#0000FF] [stroke width=20.00]}] [data="M 185 40 L 85 40 L 85 28 L 40 64 L 85 100 L 85 88 L 185 88 Z"]
+  RenderSVGRoot {svg} at (73,17) size 617x426
+    RenderSVGContainer {g} at (59,3) size 711x520 [transform={m=((2.00,0.00)(0.00,2.00)) t=(0.00,0.00)}]
+      RenderSVGContainer {a} at (66,10) size 664x473
+        RenderSVGPath {path} at (73,17) size 617x426 [stroke={[type=SOLID] [color=#0000FF] [stroke width=20.00]}] [data="M 185 40 L 85 40 L 85 28 L 40 64 L 85 100 L 85 88 L 185 88 Z"]

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

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
+  RenderSVGRoot {svg} at (3,3) size 224x224
+    RenderSVGContainer {g} at (3,3) size 224x224
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
@@ -10 +10 @@
         RenderSVGRect {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
         RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGEllipse {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGEllipse {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGEllipse {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGEllipse {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
+          RenderSVGEllipse {circle} at (1,1) size 128x128 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
+          RenderSVGEllipse {circle} at (1,111) size 128x128 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
+          RenderSVGEllipse {circle} at (111,1) size 128x128 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
+          RenderSVGEllipse {circle} at (111,111) size 128x128 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
+      RenderSVGContainer {g} at (3,3) size 224x224
+        RenderSVGContainer {use} at (3,3) size 224x224
+          [masker="mask_1"] RenderSVGResourceMasker {mask} at (3,3) size 224x224
           RenderSVGRect {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

trunk/LayoutTests/svg/css/clippath-with-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (0,0) size 210x200
+  RenderSVGRoot {svg} at (0,0) size 212x200
     RenderSVGRect {rect} at (0,0) size 200x200 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=200.00] [height=200.00]
     RenderSVGRect {rect} at (0,0) size 200x200 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-200.00,0.00)}] [x=200.00] [y=0.00] [width=200.00] [height=200.00]
     RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-      RenderSVGContainer {use} at (0,0) size 220x220
-        RenderSVGRect {rect} at (0,0) size 210x210 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-200.00,0.00)}] [x=200.00] [y=0.00] [width=200.00] [height=200.00]
-    RenderSVGRect {rect} at (0,0) size 210x200 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=400.00] [height=200.00]
-      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 210x210
+      RenderSVGContainer {use} at (0,0) size 224x224
+        RenderSVGRect {rect} at (0,0) size 212x212 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-200.00,0.00)}] [x=200.00] [y=0.00] [width=200.00] [height=200.00]
+    RenderSVGRect {rect} at (0,0) size 212x200 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=400.00] [height=200.00]
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (-2,-2) size 214x214

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

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
+  RenderSVGRoot {svg} at (3,3) size 224x224
+    RenderSVGContainer {g} at (3,3) size 224x224
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
@@ -10 +10 @@
         RenderSVGRect {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
         RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGEllipse {circle} at (5,5) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGEllipse {circle} at (5,115) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGEllipse {circle} at (115,5) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGEllipse {circle} at (115,115) size 110x110 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
+          RenderSVGEllipse {circle} at (3,3) size 114x114 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
+          RenderSVGEllipse {circle} at (3,113) size 114x114 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
+          RenderSVGEllipse {circle} at (113,3) size 114x114 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
+          RenderSVGEllipse {circle} at (113,113) size 114x114 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
+      RenderSVGContainer {g} at (3,3) size 224x224
+        RenderSVGContainer {use} at (3,3) size 224x224
+          [masker="mask_1"] RenderSVGResourceMasker {mask} at (3,3) size 224x224
           RenderSVGRect {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

trunk/LayoutTests/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 (50,50) size 210x210
-    RenderSVGPath {path} at (5,5) size 310x310 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 100 100 L 200 100 L 200 200 L 100 200 Z"]
+  RenderSVGRoot {svg} at (30,30) size 250x250
+    RenderSVGPath {path} at (0,0) size 355x355 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 100 100 L 200 100 L 200 200 L 100 200 Z"]

trunk/LayoutTests/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 (40,40) size 210x210
-    RenderSVGPath {path} at (0,0) size 295x295 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 100 100 L 200 100 L 200 200 L 100 200 Z"]
+  RenderSVGRoot {svg} at (20,20) size 250x250
+    RenderSVGPath {path} at (0,0) size 335x335 [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M 100 100 L 200 100 L 200 200 L 100 200 Z"]

trunk/LayoutTests/svg/css/text-shadow-multiple-expected.txt

@@ -31 +31 @@
           text run at (0,0) width 556: "The next two texts have subtle differences, as the stroke/fill is painted seperated in SVG."
       RenderBlock (anonymous) at (0,238) size 800x154
-        RenderSVGRoot {svg} at (0,307) size 747x90
+        RenderSVGRoot {svg} at (0,305) size 747x93
           RenderSVGText {text} at (20,20) size 720x57 contains 1 chunk(s)
             RenderSVGTSpan {tspan} at (0,0) size 95x56

trunk/LayoutTests/svg/custom/repaint-shadow-expected.txt

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (20,20) size 406x255
+  RenderSVGRoot {svg} at (20,20) size 408x257
     RenderSVGText {text} at (20,20) size 50x50 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 50x50

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

@@ -2 +2 @@
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (37,37) size 493x493
+  RenderSVGRoot {svg} at (35,35) size 495x495
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
@@ -9 +9 @@
             [feFlood flood-color="#FF0000" flood-opacity="1.00"]
             [feFlood flood-color="#008000" flood-opacity="1.00"]
-    RenderSVGRect {rect} at (24,24) size 506x506 [fill={[type=SOLID] [color=#008000]}] [x=200.00] [y=200.00] [width=300.00] [height=300.00]
+    RenderSVGRect {rect} at (20,20) size 510x510 [fill={[type=SOLID] [color=#008000]}] [x=200.00] [y=200.00] [width=300.00] [height=300.00]
       [filter="filter"] RenderSVGResourceFilter {filter} at (50,50) size 480x480

trunk/LayoutTests/svg/repaint/repaint-webkit-svg-shadow-container-expected.txt

@@ -1 +1 @@
  (repaint rects
-  (rect 8 8 300 300)
-  (rect 8 8 510 510)
-  (rect 8 8 600 600)
+  (rect 8 8 340 340)
+  (rect 8 8 594 594)
+  (rect 8 8 720 600)
 )
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Repaint rect too small on elements with shadows
+        https://bugs.webkit.org/show_bug.cgi?id=114225
+
+        Reviewed by Dain Adler.
+        
+        We assumed that shadows (box-shadow, text-shadow, svg shadows)
+        only required inflating the repaint rect by the blur radius of
+        the shadow. However, this is incorrect; the shadow can extend
+        further, which resulted in clipped or incorrectly invalidated
+        shadows.
+        
+        Fix by disambiguating the blur radius (which is 2x the standard
+        deviation of the Gaussian distribution used to generate the blur),
+        from the painting extent, which is how far the shadow visually
+        projects. Using a 1.4 multiplier of the blur radius is a good
+        approximation for the painting extent.
+        
+        Renamed ShadowData::blur() to ShadowData::radius(), and added
+        ShadowData::paintingExtent(). Use the latter in all places
+        which relate to invalidation.
+
+        Test: fast/box-shadow/shadow-repaint.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::valueForShadow):
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::fontAttributesForSelectionStart):
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::paint):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::applyShadowToGraphicsContext):
+        (WebCore::InlineTextBox::paintDecoration):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::applyBoxShadowForBackground):
+        (WebCore::areaCastingShadowInHole):
+        (WebCore::RenderBoxModelObject::paintBoxShadow):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::getShadowExtent):
+        (WebCore::RenderStyle::getShadowInsetExtent):
+        (WebCore::RenderStyle::getShadowHorizontalExtent):
+        (WebCore::RenderStyle::getShadowVerticalExtent):
+        * rendering/style/ShadowData.cpp:
+        (WebCore::ShadowData::ShadowData):
+        (WebCore::ShadowData::operator==):
+        (WebCore::calculateShadowExtent):
+        * rendering/style/ShadowData.h:
+        (WebCore::ShadowData::ShadowData):
+        (WebCore::ShadowData::radius):
+        (WebCore::ShadowData::paintingExtent):
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+
 2013-04-08  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1273 +1273 @@
         RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(s->x(), style);
         RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(s->y(), style);
-        RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->blur(), style);
+        RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->radius(), style);
         RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>() : zoomAdjustedPixelValue(s->spread(), style);
         RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style() == Normal ? PassRefPtr<CSSPrimitiveValue>() : cssValuePool().createIdentifierValue(CSSValueInset);

trunk/Source/WebCore/editing/mac/EditorMac.mm

@@ -208 +208 @@
         RetainPtr<NSShadow> s(AdoptNS, [[NSShadow alloc] init]);
         [s.get() setShadowOffset:NSMakeSize(shadow->x(), shadow->y())];
-        [s.get() setShadowBlurRadius:shadow->blur()];
+        [s.get() setShadowBlurRadius:shadow->radius()];
         [s.get() setShadowColor:nsColor(shadow->color())];
         [result setObject:s.get() forKey:NSShadowAttributeName];

trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

@@ -115 +115 @@
 
     return adoptPtr(new ShadowData(blend(from->location(), to->location(), progress),
-                                   blend(from->blur(), to->blur(), progress),
+                                   blend(from->radius(), to->radius(), progress),
                                    blend(from->spread(), to->spread(), progress),
                                    blendFunc(anim, from->style(), to->style(), progress),

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -43 +43 @@
     if (style->textShadow()) {
         context->setShadow(LayoutSize(style->textShadow()->x(), style->textShadow()->y()),
-                           style->textShadow()->blur(), style->textShadow()->color(), style->colorSpace());
+                           style->textShadow()->radius(), style->textShadow()->color(), style->colorSpace());
         setShadow = true;
     }

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -390 +390 @@
     int shadowY = horizontal ? shadow->y() : -shadow->x();
     FloatSize shadowOffset(shadowX, shadowY);
-    int shadowBlur = shadow->blur();
+    int shadowRadius = shadow->radius();
     const Color& shadowColor = shadow->color();
 
     if (shadow->next() || stroked || !opaque) {
         FloatRect shadowRect(textRect);
-        shadowRect.inflate(shadowBlur);
+        shadowRect.inflate(shadow->paintingExtent());
         shadowRect.move(shadowOffset);
         context->save();
         context->clip(shadowRect);
 
-        extraOffset = FloatSize(0, 2 * textRect.height() + max(0.0f, shadowOffset.height()) + shadowBlur);
+        extraOffset = FloatSize(0, 2 * textRect.height() + max(0.0f, shadowOffset.height()) + shadowRadius);
         shadowOffset -= extraOffset;
     }
 
-    context->setShadow(shadowOffset, shadowBlur, shadowColor, context->fillColorSpace());
+    context->setShadow(shadowOffset, shadowRadius, shadowColor, context->fillColorSpace());
     return extraOffset;
 }
@@ -1151 +1151 @@
         FloatRect clipRect(localOrigin, FloatSize(width, baseline + 2));
         for (const ShadowData* s = shadow; s; s = s->next()) {
+            int shadowExtent = s->paintingExtent();
             FloatRect shadowRect(localOrigin, FloatSize(width, baseline + 2));
-            shadowRect.inflate(s->blur());
+            shadowRect.inflate(shadowExtent);
             int shadowX = isHorizontal() ? s->x() : s->y();
             int shadowY = isHorizontal() ? s->y() : -s->x();
             shadowRect.move(shadowX, shadowY);
             clipRect.unite(shadowRect);
-            extraOffset = max(extraOffset, max(0, shadowY) + s->blur());
+            extraOffset = max(extraOffset, max(0, shadowY) + shadowExtent);
         }
         context->save();
@@ -1178 +1179 @@
             int shadowX = isHorizontal() ? shadow->x() : shadow->y();
             int shadowY = isHorizontal() ? shadow->y() : -shadow->x();
-            context->setShadow(FloatSize(shadowX, shadowY - extraOffset), shadow->blur(), shadow->color(), colorSpace);
+            context->setShadow(FloatSize(shadowX, shadowY - extraOffset), shadow->radius(), shadow->color(), colorSpace);
             setShadow = true;
             shadow = shadow->next();

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -718 +718 @@
     FloatSize shadowOffset(boxShadow->x(), boxShadow->y());
     if (!boxShadow->isWebkitBoxShadow())
-        context->setShadow(shadowOffset, boxShadow->blur(), boxShadow->color(), style->colorSpace());
+        context->setShadow(shadowOffset, boxShadow->radius(), boxShadow->color(), style->colorSpace());
     else
-        context->setLegacyShadow(shadowOffset, boxShadow->blur(), boxShadow->color(), style->colorSpace());
+        context->setLegacyShadow(shadowOffset, boxShadow->radius(), boxShadow->color(), style->colorSpace());
 }
 
@@ -2527 +2527 @@
 }
 
-static inline IntRect areaCastingShadowInHole(const IntRect& holeRect, int shadowBlur, int shadowSpread, const IntSize& shadowOffset)
+static inline IntRect areaCastingShadowInHole(const IntRect& holeRect, int shadowExtent, int shadowSpread, const IntSize& shadowOffset)
 {
     IntRect bounds(holeRect);
     
-    bounds.inflate(shadowBlur);
+    bounds.inflate(shadowExtent);
 
     if (shadowSpread < 0)
@@ -2560 +2560 @@
 
         IntSize shadowOffset(shadow->x(), shadow->y());
-        int shadowBlur = shadow->blur();
+        int shadowRadius = shadow->radius();
+        int shadowPaintingExtent = shadow->paintingExtent();
         int shadowSpread = shadow->spread();
         
-        if (shadowOffset.isZero() && !shadowBlur && !shadowSpread)
+        if (shadowOffset.isZero() && !shadowRadius && !shadowSpread)
             continue;
         
@@ -2575 +2576 @@
 
             IntRect shadowRect(border.rect());
-            shadowRect.inflate(shadowBlur + shadowSpread);
+            shadowRect.inflate(shadowPaintingExtent + shadowSpread);
             shadowRect.move(shadowOffset);
 
@@ -2583 +2584 @@
             // Move the fill just outside the clip, adding 1 pixel separation so that the fill does not
             // bleed in (due to antialiasing) if the context is transformed.
-            IntSize extraOffset(paintRect.pixelSnappedWidth() + max(0, shadowOffset.width()) + shadowBlur + 2 * shadowSpread + 1, 0);
+            IntSize extraOffset(paintRect.pixelSnappedWidth() + max(0, shadowOffset.width()) + shadowPaintingExtent + 2 * shadowSpread + 1, 0);
             shadowOffset -= extraOffset;
             fillRect.move(extraOffset);
 
             if (shadow->isWebkitBoxShadow())
-                context->setLegacyShadow(shadowOffset, shadowBlur, shadowColor, s->colorSpace());
+                context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
             else
-                context->setShadow(shadowOffset, shadowBlur, shadowColor, s->colorSpace());
+                context->setShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
 
             if (hasBorderRadius) {
@@ -2606 +2607 @@
 
                 RoundedRect influenceRect(shadowRect, border.radii());
-                influenceRect.expandRadii(2 * shadowBlur + shadowSpread);
+                influenceRect.expandRadii(2 * shadowPaintingExtent + shadowSpread);
                 if (allCornersClippedOut(influenceRect, info.rect))
                     context->fillRect(fillRect.rect(), Color::black, s->colorSpace());
@@ -2649 +2650 @@
             if (!includeLogicalLeftEdge) {
                 if (isHorizontal) {
-                    holeRect.move(-max(shadowOffset.width(), 0) - shadowBlur, 0);
-                    holeRect.setWidth(holeRect.width() + max(shadowOffset.width(), 0) + shadowBlur);
+                    holeRect.move(-max(shadowOffset.width(), 0) - shadowPaintingExtent, 0);
+                    holeRect.setWidth(holeRect.width() + max(shadowOffset.width(), 0) + shadowPaintingExtent);
                 } else {
-                    holeRect.move(0, -max(shadowOffset.height(), 0) - shadowBlur);
-                    holeRect.setHeight(holeRect.height() + max(shadowOffset.height(), 0) + shadowBlur);
+                    holeRect.move(0, -max(shadowOffset.height(), 0) - shadowPaintingExtent);
+                    holeRect.setHeight(holeRect.height() + max(shadowOffset.height(), 0) + shadowPaintingExtent);
                 }
             }
             if (!includeLogicalRightEdge) {
                 if (isHorizontal)
-                    holeRect.setWidth(holeRect.width() - min(shadowOffset.width(), 0) + shadowBlur);
+                    holeRect.setWidth(holeRect.width() - min(shadowOffset.width(), 0) + shadowPaintingExtent);
                 else
-                    holeRect.setHeight(holeRect.height() - min(shadowOffset.height(), 0) + shadowBlur);
+                    holeRect.setHeight(holeRect.height() - min(shadowOffset.height(), 0) + shadowPaintingExtent);
             }
 
             Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255);
 
-            IntRect outerRect = areaCastingShadowInHole(border.rect(), shadowBlur, shadowSpread, shadowOffset);
+            IntRect outerRect = areaCastingShadowInHole(border.rect(), shadowPaintingExtent, shadowSpread, shadowOffset);
             RoundedRect roundedHole(holeRect, border.radii());
 
@@ -2677 +2678 @@
                 context->clip(border.rect());
 
-            IntSize extraOffset(2 * paintRect.pixelSnappedWidth() + max(0, shadowOffset.width()) + shadowBlur - 2 * shadowSpread + 1, 0);
+            IntSize extraOffset(2 * paintRect.pixelSnappedWidth() + max(0, shadowOffset.width()) + shadowPaintingExtent - 2 * shadowSpread + 1, 0);
             context->translate(extraOffset.width(), extraOffset.height());
             shadowOffset -= extraOffset;
 
             if (shadow->isWebkitBoxShadow())
-                context->setLegacyShadow(shadowOffset, shadowBlur, shadowColor, s->colorSpace());
+                context->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
             else
-                context->setShadow(shadowOffset, shadowBlur, shadowColor, s->colorSpace());
+                context->setShadow(shadowOffset, shadowRadius, shadowColor, s->colorSpace());
 
             context->fillRectWithRoundedHole(outerRect, roundedHole, fillColor, s->colorSpace());

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

@@ -1346 +1346 @@
         if (shadow->style() == Inset)
             continue;
-        int blurAndSpread = shadow->blur() + shadow->spread();
-
-        top = min<LayoutUnit>(top, shadow->y() - blurAndSpread);
-        right = max<LayoutUnit>(right, shadow->x() + blurAndSpread);
-        bottom = max<LayoutUnit>(bottom, shadow->y() + blurAndSpread);
-        left = min<LayoutUnit>(left, shadow->x() - blurAndSpread);
+
+        int extentAndSpread = shadow->paintingExtent() + shadow->spread();
+        top = min<LayoutUnit>(top, shadow->y() - extentAndSpread);
+        right = max<LayoutUnit>(right, shadow->x() + extentAndSpread);
+        bottom = max<LayoutUnit>(bottom, shadow->y() + extentAndSpread);
+        left = min<LayoutUnit>(left, shadow->x() - extentAndSpread);
     }
 }
@@ -1365 +1365 @@
         if (shadow->style() == Normal)
             continue;
-        int blurAndSpread = shadow->blur() + shadow->spread();
-        top = max<LayoutUnit>(top, shadow->y() + blurAndSpread);
-        right = min<LayoutUnit>(right, shadow->x() - blurAndSpread);
-        bottom = min<LayoutUnit>(bottom, shadow->y() - blurAndSpread);
-        left = max<LayoutUnit>(left, shadow->x() + blurAndSpread);
+
+        int extentAndSpread = shadow->paintingExtent() + shadow->spread();
+        top = max<LayoutUnit>(top, shadow->y() + extentAndSpread);
+        right = min<LayoutUnit>(right, shadow->x() - extentAndSpread);
+        bottom = min<LayoutUnit>(bottom, shadow->y() - extentAndSpread);
+        left = max<LayoutUnit>(left, shadow->x() + extentAndSpread);
     }
 
@@ -1383 +1384 @@
         if (shadow->style() == Inset)
             continue;
-        int blurAndSpread = shadow->blur() + shadow->spread();
-
-        left = min<LayoutUnit>(left, shadow->x() - blurAndSpread);
-        right = max<LayoutUnit>(right, shadow->x() + blurAndSpread);
+
+        int extentAndSpread = shadow->paintingExtent() + shadow->spread();
+        left = min<LayoutUnit>(left, shadow->x() - extentAndSpread);
+        right = max<LayoutUnit>(right, shadow->x() + extentAndSpread);
     }
 }
@@ -1398 +1399 @@
         if (shadow->style() == Inset)
             continue;
-        int blurAndSpread = shadow->blur() + shadow->spread();
-
-        top = min<LayoutUnit>(top, shadow->y() - blurAndSpread);
-        bottom = max<LayoutUnit>(bottom, shadow->y() + blurAndSpread);
+
+        int extentAndSpread = shadow->paintingExtent() + shadow->spread();
+        top = min<LayoutUnit>(top, shadow->y() - extentAndSpread);
+        bottom = max<LayoutUnit>(bottom, shadow->y() + extentAndSpread);
     }
 }

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

@@ -31 +31 @@
 ShadowData::ShadowData(const ShadowData& o)
     : m_location(o.m_location)
-    , m_blur(o.m_blur)
+    , m_radius(o.m_radius)
     , m_spread(o.m_spread)
     , m_color(o.m_color)
@@ -47 +47 @@
     
     return m_location == o.m_location
-        && m_blur == o.m_blur
+        && m_radius == o.m_radius
         && m_spread == o.m_spread
         && m_style == o.m_style
@@ -57 +57 @@
 {
     do {
-        int blurAndSpread = shadow->blur() + shadow->spread() + additionalOutlineSize;
+        int extentAndSpread = shadow->paintingExtent() + shadow->spread() + additionalOutlineSize;
         if (shadow->style() == Normal) {
-            shadowLeft = min(shadow->x() - blurAndSpread, shadowLeft);
-            shadowRight = max(shadow->x() + blurAndSpread, shadowRight);
-            shadowTop = min(shadow->y() - blurAndSpread, shadowTop);
-            shadowBottom = max(shadow->y() + blurAndSpread, shadowBottom);
+            shadowLeft = min(shadow->x() - extentAndSpread, shadowLeft);
+            shadowRight = max(shadow->x() + extentAndSpread, shadowRight);
+            shadowTop = min(shadow->y() - extentAndSpread, shadowTop);
+            shadowBottom = max(shadow->y() + extentAndSpread, shadowBottom);
         }
 

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

@@ -42 +42 @@
 public:
     ShadowData()
-        : m_blur(0)
+        : m_radius(0)
         , m_spread(0)
         , m_style(Normal)
@@ -49 +49 @@
     }
 
-    ShadowData(const IntPoint& location, int blur, int spread, ShadowStyle style, bool isWebkitBoxShadow, const Color& color)
+    ShadowData(const IntPoint& location, int radius, int spread, ShadowStyle style, bool isWebkitBoxShadow, const Color& color)
         : m_location(location)
-        , m_blur(blur)
+        , m_radius(radius)
         , m_spread(spread)
         , m_color(color)
@@ -70 +70 @@
     int y() const { return m_location.y(); }
     IntPoint location() const { return m_location; }
-    int blur() const { return m_blur; }
+    int radius() const { return m_radius; }
+    int paintingExtent() const
+    {
+        // Blurring uses a Gaussian function whose std. deviation is m_radius/2, and which in theory
+        // extends to infinity. In 8-bit contexts, however, rounding causes the effect to become
+        // undetectable at around 1.4x the radius.
+        const float radiusExtentMultiplier = 1.4;
+        return ceilf(m_radius * radiusExtentMultiplier);
+    }
     int spread() const { return m_spread; }
     ShadowStyle style() const { return m_style; }
@@ -84 +92 @@
 private:
     IntPoint m_location;
-    int m_blur;
+    int m_radius; // This is the "blur radius", or twice the standard deviation of the Gaussian blur.
     int m_spread;
     Color m_color;

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp

@@ -121 +121 @@
         if (shadow) {
             m_paintInfo->context->clip(repaintRect);
-            m_paintInfo->context->setShadow(IntSize(roundToInt(shadow->x()), roundToInt(shadow->y())), shadow->blur(), shadow->color(), style->colorSpace());
+            m_paintInfo->context->setShadow(IntSize(roundToInt(shadow->x()), roundToInt(shadow->y())), shadow->radius(), shadow->color(), style->colorSpace());
             m_paintInfo->context->beginTransparencyLayer(1);
             m_renderingFlags |= EndShadowLayer;