<!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>[270095] 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/270095">270095</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-20 02:39:38 -0800 (Fri, 20 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/269570">r269570</a> - TextureMapperLayer::computeOverlapRegions: Accumulate nested replica transform matrices recursively
https://bugs.webkit.org/show_bug.cgi?id=218364

Reviewed by Don Olmstead.

Source/WebCore:

Transformed nested reflection layers were wrongly clipped because
computeOverlapRegions applied replica transform matrices
incorrectly.

Test: compositing/reflections/nested-reflection-opacity2.html

* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::resolveOverlaps):
(WebCore::TextureMapperLayer::computeOverlapRegions):
(WebCore::TextureMapperLayer::paintUsingOverlapRegions):
* platform/graphics/texmap/TextureMapperLayer.h:

LayoutTests:

* compositing/reflections/nested-reflection-opacity2-expected.html: Added.
* compositing/reflections/nested-reflection-opacity2.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit230LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog</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>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit230LayoutTestscompositingreflectionsnestedreflectionopacity2expectedhtml">releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit230LayoutTestscompositingreflectionsnestedreflectionopacity2html">releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2.html</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 (270094 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog     2020-11-20 10:39:19 UTC (rev 270094)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog        2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2020-11-08  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        TextureMapperLayer::computeOverlapRegions: Accumulate nested replica transform matrices recursively
+        https://bugs.webkit.org/show_bug.cgi?id=218364
+
+        Reviewed by Don Olmstead.
+
+        * compositing/reflections/nested-reflection-opacity2-expected.html: Added.
+        * compositing/reflections/nested-reflection-opacity2.html: Added.
+
</ins><span class="cx"> 2020-11-03  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [TextureMapper] Crashed in TextureMapperLayer::paintUsingOverlapRegions
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230LayoutTestscompositingreflectionsnestedreflectionopacity2expectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2-expected.html (0 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2-expected.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2-expected.html 2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            .reflection1 {
+                width: 200px;
+                -webkit-box-reflect: right 30px;
+            }
+            .reflection2 {
+                width: 100px;
+                opacity: 0.5;
+                -webkit-box-reflect: right 10px;
+                position: relative;
+            }
+            .reflection2 div {
+                height: 80px;
+                width: 100px;
+                background-color: blue;
+            }
+            .reflection2 .child2 {
+                margin-top: -60px;
+            }
+        </style>
+    </head>
+    <body>
+        There are four light blue squares.
+        <div class="reflection1">
+            <div class="reflection2">
+                <div>
+                </div>
+                <div class="child2">
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit230LayoutTestscompositingreflectionsnestedreflectionopacity2html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2.html (0 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2.html                               (rev 0)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/compositing/reflections/nested-reflection-opacity2.html  2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            .reflection1 {
+                width: 200px;
+                -webkit-box-reflect: right 30px;
+            }
+            .reflection2 {
+                width: 100px;
+                opacity: 0.5;
+                -webkit-box-reflect: right 10px;
+                position: relative;
+            }
+            .reflection2 div {
+                height: 80px;
+                width: 100px;
+                background-color: blue;
+                will-change: transform;
+            }
+            .reflection2 .child2 {
+                margin-top: -60px;
+            }
+        </style>
+    </head>
+    <body>
+        There are four light blue squares.
+        <div class="reflection1">
+            <div class="reflection2">
+                <div>
+                </div>
+                <div class="child2">
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (270094 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog  2020-11-20 10:39:19 UTC (rev 270094)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog     2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2020-11-08  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><ins>+        TextureMapperLayer::computeOverlapRegions: Accumulate nested replica transform matrices recursively
+        https://bugs.webkit.org/show_bug.cgi?id=218364
+
+        Reviewed by Don Olmstead.
+
+        Transformed nested reflection layers were wrongly clipped because
+        computeOverlapRegions applied replica transform matrices
+        incorrectly.
+
+        Test: compositing/reflections/nested-reflection-opacity2.html
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::resolveOverlaps):
+        (WebCore::TextureMapperLayer::computeOverlapRegions):
+        (WebCore::TextureMapperLayer::paintUsingOverlapRegions):
+        * platform/graphics/texmap/TextureMapperLayer.h:
+
+2020-11-08  Fujii Hironori  <Hironori.Fujii@sony.com>
+
</ins><span class="cx">         [GraphicsLayerTextureMapper] reflection masks aren't applied
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=218429
</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 (270094 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp    2020-11-20 10:39:19 UTC (rev 270094)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp       2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -307,17 +307,19 @@
</span><span class="cx">         .multiply(m_layerTransforms.combined.inverse().valueOr(TransformationMatrix()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void resolveOverlaps(Region& newRegion, Region& overlapRegion, Region& nonOverlapRegion)
</del><ins>+static void resolveOverlaps(const IntRect& newRegion, Region& overlapRegion, Region& nonOverlapRegion)
</ins><span class="cx"> {
</span><span class="cx">     Region newOverlapRegion(newRegion);
</span><span class="cx">     newOverlapRegion.intersect(nonOverlapRegion);
</span><span class="cx">     nonOverlapRegion.subtract(newOverlapRegion);
</span><span class="cx">     overlapRegion.unite(newOverlapRegion);
</span><del>-    newRegion.subtract(overlapRegion);
-    nonOverlapRegion.unite(newRegion);
</del><ins>+
+    Region newNonOverlapRegion(newRegion);
+    newNonOverlapRegion.subtract(overlapRegion);
+    nonOverlapRegion.unite(newNonOverlapRegion);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TextureMapperLayer::computeOverlapRegions(const TextureMapperPaintOptions& options, Region& overlapRegion, Region& nonOverlapRegion, ResolveSelfOverlapMode mode)
</del><ins>+void TextureMapperLayer::computeOverlapRegions(ComputeOverlapRegionData& data, const TransformationMatrix& accumulatedReplicaTransform, bool includesReplica)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_state.visible || !m_state.contentsVisible)
</span><span class="cx">         return;
</span><span class="lines">@@ -336,51 +338,31 @@
</span><span class="cx">         localBoundingRect.unite(unfilteredTargetRect);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    TransformationMatrix transform;
-    transform.multiply(options.transform);
</del><ins>+    TransformationMatrix transform(accumulatedReplicaTransform);
</ins><span class="cx">     transform.multiply(m_layerTransforms.combined);
</span><span class="cx"> 
</span><del>-    TransformationMatrix replicaMatrix;
-    if (m_state.replicaLayer) {
-        replicaMatrix = replicaTransform();
-        localBoundingRect.unite(replicaMatrix.mapRect(localBoundingRect));
-    }
-
-    IntRect clipBounds(options.textureMapper.clipBounds());
-    clipBounds.move(-options.offset);
-
</del><span class="cx">     IntRect viewportBoundingRect = enclosingIntRect(transform.mapRect(localBoundingRect));
</span><del>-    viewportBoundingRect.intersect(clipBounds);
</del><ins>+    viewportBoundingRect.intersect(data.clipBounds);
</ins><span class="cx"> 
</span><del>-    // Count all masks and filters as overlap layers.
-    if (hasFilters() || m_state.maskLayer || (m_state.replicaLayer && m_state.replicaLayer->m_state.maskLayer)) {
-        Region newOverlapRegion(viewportBoundingRect);
-        nonOverlapRegion.subtract(newOverlapRegion);
-        overlapRegion.unite(newOverlapRegion);
-        return;
</del><ins>+    switch (data.mode) {
+    case ComputeOverlapRegionMode::Intersection:
+        resolveOverlaps(viewportBoundingRect, data.overlapRegion, data.nonOverlapRegion);
+        break;
+    case ComputeOverlapRegionMode::Union:
+        data.overlapRegion.unite(viewportBoundingRect);
+        break;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    Region newOverlapRegion;
-    Region newNonOverlapRegion(viewportBoundingRect);
</del><ins>+    if (m_state.replicaLayer && includesReplica) {
+        TransformationMatrix newReplicaTransform(accumulatedReplicaTransform);
+        newReplicaTransform.multiply(replicaTransform());
+        computeOverlapRegions(data, newReplicaTransform, false);
+    }
</ins><span class="cx"> 
</span><span class="cx">     if (!m_state.masksToBounds) {
</span><span class="cx">         for (auto* child : m_children)
</span><del>-            child->computeOverlapRegions(options, newOverlapRegion, newNonOverlapRegion, ResolveSelfOverlapIfNeeded);
</del><ins>+            child->computeOverlapRegions(data, accumulatedReplicaTransform);
</ins><span class="cx">     }
</span><del>-
-    if (m_state.replicaLayer) {
-        newOverlapRegion.unite(replicaMatrix.mapRect(newOverlapRegion.bounds()));
-        Region replicaRegion(replicaMatrix.mapRect(newNonOverlapRegion.bounds()));
-        resolveOverlaps(replicaRegion, newOverlapRegion, newNonOverlapRegion);
-    }
-
-    if ((mode != ResolveSelfOverlapAlways) && shouldBlend()) {
-        newNonOverlapRegion.unite(newOverlapRegion);
-        newOverlapRegion = Region();
-    }
-
-    overlapRegion.unite(newOverlapRegion);
-    resolveOverlaps(newNonOverlapRegion, overlapRegion, nonOverlapRegion);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void TextureMapperLayer::paintUsingOverlapRegions(const TextureMapperPaintOptions& options)
</span><span class="lines">@@ -387,7 +369,15 @@
</span><span class="cx"> {
</span><span class="cx">     Region overlapRegion;
</span><span class="cx">     Region nonOverlapRegion;
</span><del>-    computeOverlapRegions(options, overlapRegion, nonOverlapRegion, ResolveSelfOverlapAlways);
</del><ins>+    bool needsUnion = hasFilters() || m_state.maskLayer || (m_state.replicaLayer && m_state.replicaLayer->m_state.maskLayer);
+    ComputeOverlapRegionData data {
+        needsUnion ? ComputeOverlapRegionMode::Union : ComputeOverlapRegionMode::Intersection,
+        options.textureMapper.clipBounds(),
+        overlapRegion,
+        nonOverlapRegion
+    };
+    data.clipBounds.move(-options.offset);
+    computeOverlapRegions(data, options.transform);
</ins><span class="cx">     if (overlapRegion.isEmpty()) {
</span><span class="cx">         paintSelfAndChildrenWithReplica(options);
</span><span class="cx">         return;
</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 (270094 => 270095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h      2020-11-20 10:39:19 UTC (rev 270094)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2020-11-20 10:39:38 UTC (rev 270095)
</span><span class="lines">@@ -123,11 +123,17 @@
</span><span class="cx">     void removeFromParent();
</span><span class="cx">     void removeAllChildren();
</span><span class="cx"> 
</span><del>-    enum ResolveSelfOverlapMode {
-        ResolveSelfOverlapAlways = 0,
-        ResolveSelfOverlapIfNeeded
</del><ins>+    enum class ComputeOverlapRegionMode : uint8_t {
+        Intersection,
+        Union
</ins><span class="cx">     };
</span><del>-    void computeOverlapRegions(const TextureMapperPaintOptions&, Region& overlapRegion, Region& nonOverlapRegion, ResolveSelfOverlapMode);
</del><ins>+    struct ComputeOverlapRegionData {
+        ComputeOverlapRegionMode mode;
+        IntRect clipBounds;
+        Region& overlapRegion;
+        Region& nonOverlapRegion;
+    };
+    void computeOverlapRegions(ComputeOverlapRegionData&, const TransformationMatrix&, bool includesReplica = true);
</ins><span class="cx"> 
</span><span class="cx">     void paintRecursive(const TextureMapperPaintOptions&);
</span><span class="cx">     void paintUsingOverlapRegions(const TextureMapperPaintOptions&);
</span></span></pre>
</div>
</div>

</body>
</html>