Title: [269772] trunk
Revision
269772
Author
[email protected]
Date
2020-11-13 05:12:16 -0800 (Fri, 13 Nov 2020)

Log 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  <[email protected]>.

* 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (269771 => 269772)


--- trunk/LayoutTests/ChangeLog	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/LayoutTests/ChangeLog	2020-11-13 13:12:16 UTC (rev 269772)
@@ -1,3 +1,14 @@
+2020-11-13  Miguel Gomez  <[email protected]>
+
+        [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  <[email protected]>
 
         Add infrastructure for WebRTC transforms

Modified: trunk/LayoutTests/platform/glib/TestExpectations (269771 => 269772)


--- trunk/LayoutTests/platform/glib/TestExpectations	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/LayoutTests/platform/glib/TestExpectations	2020-11-13 13:12:16 UTC (rev 269772)
@@ -273,12 +273,8 @@
 # Pass instead of removing this line.
 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 ]
 

Modified: trunk/Source/WebCore/ChangeLog (269771 => 269772)


--- trunk/Source/WebCore/ChangeLog	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebCore/ChangeLog	2020-11-13 13:12:16 UTC (rev 269772)
@@ -1,3 +1,25 @@
+2020-11-13  Miguel Gomez  <[email protected]>
+
+        [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  <[email protected]>.
+
+        * 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  <[email protected]>
 
         [LFC][Integration] Minor rename and cleanup in InlineContentBuilder

Modified: trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h (269771 => 269772)


--- trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h	2020-11-13 13:12:16 UTC (rev 269772)
@@ -185,6 +185,7 @@
         RefPtr<CompositionLayer> replica;
         RefPtr<CompositionLayer> mask;
         RefPtr<CompositionLayer> backdropLayer;
+        WebCore::FloatRoundedRect backdropFiltersRect;
 
         RefPtr<ContentLayer> contentLayer;
         RefPtr<BackingStore> backingStore;
@@ -252,6 +253,8 @@
             staging.filters = pending.filters;
         if (pending.delta.backdropFiltersChanged)
             staging.backdropLayer = pending.backdropLayer;
+        if (pending.delta.backdropFiltersRectChanged)
+            staging.backdropFiltersRect = pending.backdropFiltersRect;
         if (pending.delta.animationsChanged)
             staging.animations = pending.animations;
 

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (269771 => 269772)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp	2020-11-13 13:12:16 UTC (rev 269772)
@@ -231,7 +231,7 @@
         clipTransform.translate(options.offset.width(), options.offset.height());
         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();
     }
@@ -561,6 +561,11 @@
         m_state.backdropLayer = nullptr;
 }
 
+void TextureMapperLayer::setBackdropFiltersRect(const FloatRoundedRect& backdropFiltersRect)
+{
+    m_state.backdropFiltersRect = backdropFiltersRect;
+}
+
 void TextureMapperLayer::setPosition(const FloatPoint& position)
 {
     m_state.pos = position;

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (269771 => 269772)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h	2020-11-13 13:12:16 UTC (rev 269772)
@@ -59,6 +59,7 @@
     void setMaskLayer(TextureMapperLayer*);
     void setReplicaLayer(TextureMapperLayer*);
     void setBackdropLayer(TextureMapperLayer*);
+    void setBackdropFiltersRect(const FloatRoundedRect&);
     void setPosition(const FloatPoint&);
     void setBoundsOrigin(const FloatPoint&);
     void setSize(const FloatSize&);
@@ -177,6 +178,7 @@
         WeakPtr<TextureMapperLayer> maskLayer;
         WeakPtr<TextureMapperLayer> replicaLayer;
         WeakPtr<TextureMapperLayer> backdropLayer;
+        FloatRoundedRect backdropFiltersRect;
         Color solidColor;
         FilterOperations filters;
         Color debugBorderColor;

Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (269771 => 269772)


--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp	2020-11-13 13:12:16 UTC (rev 269772)
@@ -530,6 +530,7 @@
             return false;
     } else
         clearBackdropFilters();
+
     didChangeBackdropFilters();
 
     return canCompositeFilters;
@@ -955,6 +956,9 @@
                     m_backdropLayer->setPosition(m_backdropFiltersRect.rect().location());
                 }
 
+                if (localDelta.backdropFiltersRectChanged)
+                    state.backdropFiltersRect = m_backdropFiltersRect;
+
                 if (localDelta.animationsChanged)
                     state.animations = m_animations;
 

Modified: trunk/Source/WebKit/ChangeLog (269771 => 269772)


--- trunk/Source/WebKit/ChangeLog	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebKit/ChangeLog	2020-11-13 13:12:16 UTC (rev 269772)
@@ -1,3 +1,15 @@
+2020-11-13  Miguel Gomez  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove SecItemShim.dylib from network service link

Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (269771 => 269772)


--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp	2020-11-13 12:41:19 UTC (rev 269771)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp	2020-11-13 13:12:16 UTC (rev 269772)
@@ -306,6 +306,8 @@
                             layer.setFilters(layerState.filters);
                         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);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to