Changeset 74673 in webkit

Timestamp:

Dec 26, 2010 8:42:01 PM (13 years ago)

Author:

morrita@google.com

Message:

2010-12-26 MORITA Hajime <​morrita@google.com>

Reviewed by Dan Bernstein.

For box-shadow, non-primary shadows should have specified radii.
​https://bugs.webkit.org/show_bug.cgi?id=51386

• fast/box-shadow/spread-multiple-normal-expected.txt: Added.
• fast/box-shadow/spread-multiple-normal.html: Added.
• fast/box-shadow/spread-multiple-normal-expected.checksum: Added.
• fast/box-shadow/spread-multiple-normal-expected.png: Added.

2010-12-26 MORITA Hajime <​morrita@google.com>

Reviewed by Dan Bernstein.

For box-shadow, non-primary shadows should have specified radii.
​https://bugs.webkit.org/show_bug.cgi?id=51386

On paintBoxShadow(), the spread value accidentally accumulated accidentally
during the loop, which should be applied individually for radius of each shadow.
This change makes the radii for rects computed for each shadow.

Test: fast/box-shadow/spread-multiple-normal.html

• rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintBoxShadow):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/spread-multiple-normal-expected.checksum (added)
• LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png (added)
• LayoutTests/fast/box-shadow/spread-multiple-normal-expected.txt (added)
• LayoutTests/fast/box-shadow/spread-multiple-normal.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBoxModelObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-26  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Dan Bernstein.
+
+        For box-shadow, non-primary shadows should have specified radii.
+        https://bugs.webkit.org/show_bug.cgi?id=51386
+
+        * fast/box-shadow/spread-multiple-normal-expected.txt: Added.
+        * fast/box-shadow/spread-multiple-normal.html: Added.
+        * fast/box-shadow/spread-multiple-normal-expected.checksum: Added.
+        * fast/box-shadow/spread-multiple-normal-expected.png: Added.
+
 2010-12-26  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-26  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Dan Bernstein.
+
+        For box-shadow, non-primary shadows should have specified radii.
+        https://bugs.webkit.org/show_bug.cgi?id=51386
+
+        On paintBoxShadow(), the spread value accidentally accumulated accidentally
+        during the loop, which should be applied individually for radius of each shadow. 
+        This change makes the radii for rects computed for each shadow.
+        
+        Test: fast/box-shadow/spread-multiple-normal.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintBoxShadow):
+
 2010-12-26  Patrick Gansterer  <paroga@webkit.org>
 

trunk/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1713 +1713 @@
                 IntSize bottomRightToClipOut = bottomRight;
 
+                IntSize topLeftToFill = topLeft;
+                IntSize topRightToFill = topRight;
+                IntSize bottomLeftToFill  = bottomLeft;
+                IntSize bottomRightToFill = bottomRight;
                 if (shadowSpread < 0)
-                    uniformlyExpandBorderRadii(shadowSpread, topLeft, topRight, bottomLeft, bottomRight);
+                    uniformlyExpandBorderRadii(shadowSpread, topLeftToFill, topRightToFill, bottomLeftToFill, bottomRightToFill);
 
                 // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
@@ -1726 +1730 @@
                 if (!rectToClipOut.isEmpty())
                     context->clipOutRoundedRect(rectToClipOut, topLeftToClipOut, topRightToClipOut, bottomLeftToClipOut, bottomRightToClipOut);
-                context->fillRoundedRect(fillRect, topLeft, topRight, bottomLeft, bottomRight, Color::black, s->colorSpace());
+                context->fillRoundedRect(fillRect, topLeftToFill, topRightToFill, bottomLeftToFill, bottomRightToFill, Color::black, s->colorSpace());
             } else {
                 IntRect rectToClipOut = rect;