Changeset 269772 in webkit

Timestamp:

Nov 13, 2020, 5:12:16 AM (6 years ago)

Author:

magomez@igalia.com

Message:

[GTK][WPE] CSS backdrop overlay corners are not rounded on results.webkit.org
​https://bugs.webkit.org/show_bug.cgi?id=215445

Reviewed by Carlos Garcia Campos.

Source/WebCore:

Pass the backdropFiltersRect from CoordinatedGraphicsLayer through Nicosia to TextureMapperLayer. The
latter will use this value to clip when painting the backdrop layer.

Based on a patch created by Carlos Garcia Campos <​cgarcia@igalia.com>.

• platform/graphics/nicosia/NicosiaPlatformLayer.h:

(Nicosia::CompositionLayer::flushState):

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::paintSelfAndChildren):
(WebCore::TextureMapperLayer::setBackdropFiltersRect):

• platform/graphics/texmap/TextureMapperLayer.h:
• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::setBackdropFilters):
(WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):

Source/WebKit:

Pass the backdropFiltersRect from the state to TextureMapperLayer.

• Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:

(WebKit::CoordinatedGraphicsScene::updateSceneState):

LayoutTests:

Update expectations for passing tests.

• platform/glib/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/glib/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-11-13  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK][WPE] CSS backdrop overlay corners are not rounded on results.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=215445
+
+        Reviewed by Carlos Garcia Campos.
+
+        Update expectations for passing tests.
+
+        * platform/glib/TestExpectations:
+
 2020-11-12  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/platform/glib/TestExpectations

@@ -274 +274 @@
 webkit.org/b/214259 fast/gradients/conic-gradient-alpha.html [ ImageOnlyFailure ]
 
-webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html [ ImageOnlyFailure ]
 webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius-and-reflection-add.html [ ImageOnlyFailure ]
 webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius-and-reflection.html [ ImageOnlyFailure ]
-webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius-value-change.html [ ImageOnlyFailure ]
-webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius.html [ ImageOnlyFailure ]
-webkit.org/b/169988 css3/filters/backdrop/effect-hw.html [ ImageOnlyFailure ]
 
 webkit.org/b/214682 imported/w3c/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK][WPE] CSS backdrop overlay corners are not rounded on results.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=215445
+
+        Reviewed by Carlos Garcia Campos.
+
+        Pass the backdropFiltersRect from CoordinatedGraphicsLayer through Nicosia to TextureMapperLayer. The
+        latter will use this value to clip when painting the backdrop layer.
+
+        Based on a patch created by Carlos Garcia Campos  <cgarcia@igalia.com>.
+
+        * platform/graphics/nicosia/NicosiaPlatformLayer.h:
+        (Nicosia::CompositionLayer::flushState):
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::paintSelfAndChildren):
+        (WebCore::TextureMapperLayer::setBackdropFiltersRect):
+        * platform/graphics/texmap/TextureMapperLayer.h:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::setBackdropFilters):
+        (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
+
 2020-11-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h

@@ -186 +186 @@
         RefPtr<CompositionLayer> mask;
         RefPtr<CompositionLayer> backdropLayer;
+        WebCore::FloatRoundedRect backdropFiltersRect;
 
         RefPtr<ContentLayer> contentLayer;
@@ -253 +254 @@
         if (pending.delta.backdropFiltersChanged)
             staging.backdropLayer = pending.backdropLayer;
+        if (pending.delta.backdropFiltersRectChanged)
+            staging.backdropFiltersRect = pending.backdropFiltersRect;
         if (pending.delta.animationsChanged)
             staging.animations = pending.animations;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@ -232 +232 @@
         clipTransform.multiply(options.transform);
         clipTransform.multiply(m_layerTransforms.combined);
-        options.textureMapper.beginClip(clipTransform, FloatRoundedRect(layerRect()));
+        options.textureMapper.beginClip(clipTransform, m_state.backdropFiltersRect);
         m_state.backdropLayer->paintRecursive(options);
         options.textureMapper.endClip();
@@ -562 +562 @@
 }
 
+void TextureMapperLayer::setBackdropFiltersRect(const FloatRoundedRect& backdropFiltersRect)
+{
+    m_state.backdropFiltersRect = backdropFiltersRect;
+}
+
 void TextureMapperLayer::setPosition(const FloatPoint& position)
 {

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

@@ -60 +60 @@
     void setReplicaLayer(TextureMapperLayer*);
     void setBackdropLayer(TextureMapperLayer*);
+    void setBackdropFiltersRect(const FloatRoundedRect&);
     void setPosition(const FloatPoint&);
     void setBoundsOrigin(const FloatPoint&);
@@ -178 +179 @@
         WeakPtr<TextureMapperLayer> replicaLayer;
         WeakPtr<TextureMapperLayer> backdropLayer;
+        FloatRoundedRect backdropFiltersRect;
         Color solidColor;
         FilterOperations filters;

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

@@ -531 +531 @@
     } else
         clearBackdropFilters();
+
     didChangeBackdropFilters();
 
@@ -956 +957 @@
                 }
 
+                if (localDelta.backdropFiltersRectChanged)
+                    state.backdropFiltersRect = m_backdropFiltersRect;
+
                 if (localDelta.animationsChanged)
                     state.animations = m_animations;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-13  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK][WPE] CSS backdrop overlay corners are not rounded on results.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=215445
+
+        Reviewed by Carlos Garcia Campos.
+
+        Pass the backdropFiltersRect from the state to TextureMapperLayer.
+
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+        (WebKit::CoordinatedGraphicsScene::updateSceneState):
+
 2020-11-13  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp

@@ -307 +307 @@
                         if (layerState.delta.backdropFiltersChanged)
                             layer.setBackdropLayer(layerState.backdropLayer ? &texmapLayer(*layerState.backdropLayer) : nullptr);
+                        if (layerState.delta.backdropFiltersRectChanged)
+                            layer.setBackdropFiltersRect(layerState.backdropFiltersRect);
                         if (layerState.delta.animationsChanged)
                             layer.setAnimations(layerState.animations);