Diff
Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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-09 Fujii Hironori <[email protected]>
[TextureMapper] backdrop-filter should use the identity transform to render the root layer
Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/TestExpectations (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/TestExpectations 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/TestExpectations 2020-11-20 10:40:37 UTC (rev 270098)
@@ -170,12 +170,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: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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-09 Fujii Hironori <[email protected]>
[TextureMapper] backdrop-filter should use the identity transform to render the root layer
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2020-11-20 10:40:37 UTC (rev 270098)
@@ -228,7 +228,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();
}
@@ -553,6 +553,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: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2020-11-20 10:40:37 UTC (rev 270098)
@@ -540,6 +540,7 @@
return false;
} else
clearBackdropFilters();
+
didChangeBackdropFilters();
return canCompositeFilters;
@@ -965,6 +966,9 @@
m_backdropLayer->setPosition(m_backdropFiltersRect.rect().location());
}
+ if (localDelta.backdropFiltersRectChanged)
+ state.backdropFiltersRect = m_backdropFiltersRect;
+
if (localDelta.animationsChanged)
state.animations = m_animations;
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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-10-23 Miguel Gomez <[email protected]>
[GTK][WPE] Implement antialiased rounded rectangle clipping in TextureMapper
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (270097 => 270098)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2020-11-20 10:40:16 UTC (rev 270097)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2020-11-20 10:40:37 UTC (rev 270098)
@@ -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);
