Changeset 260858 in webkit

Timestamp:

Apr 28, 2020 5:12:28 PM (4 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r260808): Backdrops on music.apple.com are offset
​https://bugs.webkit.org/show_bug.cgi?id=211153
Source/WebCore:

<rdar://problem/62543158>

Reviewed by Zalan Bujtas.

The border-radius code path failed to offset the rounded rect by contentOffsetInCompositingLayer().

Test: compositing/filters/backdrop-filter-rect-border-radius.html

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateBackdropFiltersGeometry):

LayoutTests:

Reviewed by Zalan Bujtas.

• compositing/filters/backdrop-filter-rect-border-radius-expected.html: Added.
• compositing/filters/backdrop-filter-rect-border-radius.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/filters/backdrop-filter-rect-border-radius-expected.html (added)
• LayoutTests/compositing/filters/backdrop-filter-rect-border-radius.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-28  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r260808): Backdrops on music.apple.com are offset
+        https://bugs.webkit.org/show_bug.cgi?id=211153
+
+        Reviewed by Zalan Bujtas.
+
+        * compositing/filters/backdrop-filter-rect-border-radius-expected.html: Added.
+        * compositing/filters/backdrop-filter-rect-border-radius.html: Added.
+
 2020-04-28  Noam Rosenthal  <noam@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-28  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r260808): Backdrops on music.apple.com are offset
+        https://bugs.webkit.org/show_bug.cgi?id=211153
+        <rdar://problem/62543158>
+
+        Reviewed by Zalan Bujtas.
+
+        The border-radius code path failed to offset the rounded rect by contentOffsetInCompositingLayer().
+
+        Test: compositing/filters/backdrop-filter-rect-border-radius.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateBackdropFiltersGeometry):
+
 2020-04-28  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -638 +638 @@
 
     auto& renderBox = downcast<RenderBox>(this->renderer());
-    LayoutRect boxRect = renderBox.borderBoxRect();
-    if (renderBox.hasClip())
-        boxRect.intersect(renderBox.clipRect(LayoutPoint(), nullptr));
-    boxRect.move(contentOffsetInCompositingLayer());
 
     FloatRoundedRect backdropFiltersRect;
-    if (renderBox.style().hasBorderRadius() && !renderBox.hasClip())
-        backdropFiltersRect = renderBox.roundedBorderBoxRect().pixelSnappedRoundedRectForPainting(deviceScaleFactor());
-    else
+    if (renderBox.style().hasBorderRadius() && !renderBox.hasClip()) {
+        auto roundedBoxRect = renderBox.roundedBorderBoxRect();
+        roundedBoxRect.move(contentOffsetInCompositingLayer());
+        backdropFiltersRect = roundedBoxRect.pixelSnappedRoundedRectForPainting(deviceScaleFactor());
+    } else {
+        auto boxRect = renderBox.borderBoxRect();
+        if (renderBox.hasClip())
+            boxRect.intersect(renderBox.clipRect(LayoutPoint(), nullptr));
+        boxRect.move(contentOffsetInCompositingLayer());
         backdropFiltersRect = FloatRoundedRect(snapRectToDevicePixels(boxRect, deviceScaleFactor()));
+    }
 
     m_graphicsLayer->setBackdropFiltersRect(backdropFiltersRect);