Changeset 252689 in webkit

Timestamp:

Nov 20, 2019 9:12:08 AM (4 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r252161): box-shadow with inset and rounded borders is clipped
​https://bugs.webkit.org/show_bug.cgi?id=204348

Reviewed by Zalan Bujtas.

Source/WebCore:

r252161 introduced a bug for inset shadows where we passed the wrong rect to areaCastingShadowInHole().
Clean the code up a little, and make the xOffset stuff more similar to the outset shadow path.
We could still do a better job of pixel snapping here.

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

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintBoxShadow):

LayoutTests:

• fast/box-shadow/inset-box-shadow-expected.html: Added.
• fast/box-shadow/inset-box-shadow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/inset-box-shadow-expected.html (added)
• LayoutTests/fast/box-shadow/inset-box-shadow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-20  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r252161): box-shadow with inset and rounded borders is clipped
+        https://bugs.webkit.org/show_bug.cgi?id=204348
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/box-shadow/inset-box-shadow-expected.html: Added.
+        * fast/box-shadow/inset-box-shadow.html: Added.
+
 2019-11-20  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-20  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r252161): box-shadow with inset and rounded borders is clipped
+        https://bugs.webkit.org/show_bug.cgi?id=204348
+
+        Reviewed by Zalan Bujtas.
+
+        r252161 introduced a bug for inset shadows where we passed the wrong rect to areaCastingShadowInHole().
+        Clean the code up a little, and make the xOffset stuff more similar to the outset shadow path.
+        We could still do a better job of pixel snapping here.
+
+        Test: fast/box-shadow/inset-box-shadow.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintBoxShadow):
+
 2019-11-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2475 +2475 @@
             Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255);
 
-            FloatRect pixelSnappedOuterRect = snapRectToDevicePixels(areaCastingShadowInHole(holeRect, shadowPaintingExtent, shadowSpread, shadowOffset), deviceScaleFactor);
+            LayoutRect shadowCastingRect = areaCastingShadowInHole(border.rect(), shadowPaintingExtent, shadowSpread, shadowOffset);
             RoundedRect roundedHoleRect(holeRect, border.radii());
+
+            FloatRect pixelSnappedOuterRect = snapRectToDevicePixels(shadowCastingRect, deviceScaleFactor);
             FloatRoundedRect pixelSnappedRoundedHole = roundedHoleRect.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
 
@@ -2486 +2488 @@
                 context.clip(pixelSnappedBorderRect.rect());
 
-            IntSize extraOffset(2 * roundToInt(paintRect.width()) + std::max<LayoutUnit>(0, shadowOffset.width()) + shadowPaintingExtent - 2 * shadowSpread + 1, 0);
+            LayoutUnit xOffset = 2 * paintRect.width() + std::max<LayoutUnit>(0, shadowOffset.width()) + shadowPaintingExtent + 2 * shadowSpread + LayoutUnit(1);
+            LayoutSize extraOffset(xOffset.ceil(), 0);
+
             context.translate(extraOffset);
             shadowOffset -= extraOffset;