<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[270098] releases/WebKitGTK/webkit-2.30</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/270098">270098</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-20 02:40:37 -0800 (Fri, 20 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/269772">r269772</a> - [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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit230LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit230LayoutTestsplatformglibTestExpectations">releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiaNicosiaPlatformLayerh">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapTextureMapperLayerh">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">releases/WebKitGTK/webkit-2.30/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit230LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2020-11-09  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [TextureMapper] backdrop-filter should use the identity transform to render the root layer
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230LayoutTestsplatformglibTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/TestExpectations (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -170,12 +170,8 @@
</span><span class="cx"> # Pass instead of removing this line.
</span><span class="cx"> webkit.org/b/214259 fast/gradients/conic-gradient-alpha.html [ ImageOnlyFailure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-uneven-corner-radii.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius-and-reflection-add.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/169988 css3/filters/backdrop/backdrop-filter-with-border-radius-and-reflection.html [ ImageOnlyFailure ]
</span><del>-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 ]
</del><span class="cx"> 
</span><span class="cx"> webkit.org/b/214682 imported/w3c/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html [ Pass Failure ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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):
+
</ins><span class="cx"> 2020-11-09  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [TextureMapper] backdrop-filter should use the identity transform to render the root layer
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiaNicosiaPlatformLayerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/NicosiaPlatformLayer.h (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,6 +185,7 @@
</span><span class="cx">         RefPtr<CompositionLayer> replica;
</span><span class="cx">         RefPtr<CompositionLayer> mask;
</span><span class="cx">         RefPtr<CompositionLayer> backdropLayer;
</span><ins>+        WebCore::FloatRoundedRect backdropFiltersRect;
</ins><span class="cx"> 
</span><span class="cx">         RefPtr<ContentLayer> contentLayer;
</span><span class="cx">         RefPtr<BackingStore> backingStore;
</span><span class="lines">@@ -252,6 +253,8 @@
</span><span class="cx">             staging.filters = pending.filters;
</span><span class="cx">         if (pending.delta.backdropFiltersChanged)
</span><span class="cx">             staging.backdropLayer = pending.backdropLayer;
</span><ins>+        if (pending.delta.backdropFiltersRectChanged)
+            staging.backdropFiltersRect = pending.backdropFiltersRect;
</ins><span class="cx">         if (pending.delta.animationsChanged)
</span><span class="cx">             staging.animations = pending.animations;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">         clipTransform.translate(options.offset.width(), options.offset.height());
</span><span class="cx">         clipTransform.multiply(options.transform);
</span><span class="cx">         clipTransform.multiply(m_layerTransforms.combined);
</span><del>-        options.textureMapper.beginClip(clipTransform, FloatRoundedRect(layerRect()));
</del><ins>+        options.textureMapper.beginClip(clipTransform, m_state.backdropFiltersRect);
</ins><span class="cx">         m_state.backdropLayer->paintRecursive(options);
</span><span class="cx">         options.textureMapper.endClip();
</span><span class="cx">     }
</span><span class="lines">@@ -553,6 +553,11 @@
</span><span class="cx">         m_state.backdropLayer = nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TextureMapperLayer::setBackdropFiltersRect(const FloatRoundedRect& backdropFiltersRect)
+{
+    m_state.backdropFiltersRect = backdropFiltersRect;
+}
+
</ins><span class="cx"> void TextureMapperLayer::setPosition(const FloatPoint& position)
</span><span class="cx"> {
</span><span class="cx">     m_state.pos = position;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapTextureMapperLayerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">     void setMaskLayer(TextureMapperLayer*);
</span><span class="cx">     void setReplicaLayer(TextureMapperLayer*);
</span><span class="cx">     void setBackdropLayer(TextureMapperLayer*);
</span><ins>+    void setBackdropFiltersRect(const FloatRoundedRect&);
</ins><span class="cx">     void setPosition(const FloatPoint&);
</span><span class="cx">     void setBoundsOrigin(const FloatPoint&);
</span><span class="cx">     void setSize(const FloatSize&);
</span><span class="lines">@@ -177,6 +178,7 @@
</span><span class="cx">         WeakPtr<TextureMapperLayer> maskLayer;
</span><span class="cx">         WeakPtr<TextureMapperLayer> replicaLayer;
</span><span class="cx">         WeakPtr<TextureMapperLayer> backdropLayer;
</span><ins>+        FloatRoundedRect backdropFiltersRect;
</ins><span class="cx">         Color solidColor;
</span><span class="cx">         FilterOperations filters;
</span><span class="cx">         Color debugBorderColor;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -540,6 +540,7 @@
</span><span class="cx">             return false;
</span><span class="cx">     } else
</span><span class="cx">         clearBackdropFilters();
</span><ins>+
</ins><span class="cx">     didChangeBackdropFilters();
</span><span class="cx"> 
</span><span class="cx">     return canCompositeFilters;
</span><span class="lines">@@ -965,6 +966,9 @@
</span><span class="cx">                     m_backdropLayer->setPosition(m_backdropFiltersRect.rect().location());
</span><span class="cx">                 }
</span><span class="cx"> 
</span><ins>+                if (localDelta.backdropFiltersRectChanged)
+                    state.backdropFiltersRect = m_backdropFiltersRect;
+
</ins><span class="cx">                 if (localDelta.animationsChanged)
</span><span class="cx">                     state.animations = m_animations;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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):
+
</ins><span class="cx"> 2020-10-23  Miguel Gomez  <magomez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] Implement antialiased rounded rectangle clipping in TextureMapper
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (270097 => 270098)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -306,6 +306,8 @@
</span><span class="cx">                             layer.setFilters(layerState.filters);
</span><span class="cx">                         if (layerState.delta.backdropFiltersChanged)
</span><span class="cx">                             layer.setBackdropLayer(layerState.backdropLayer ? &texmapLayer(*layerState.backdropLayer) : nullptr);
</span><ins>+                        if (layerState.delta.backdropFiltersRectChanged)
+                            layer.setBackdropFiltersRect(layerState.backdropFiltersRect);
</ins><span class="cx">                         if (layerState.delta.animationsChanged)
</span><span class="cx">                             layer.setAnimations(layerState.animations);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>