<!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>[270086] releases/WebKitGTK/webkit-2.30/Source/WebCore</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/270086">270086</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-20 02:36:58 -0800 (Fri, 20 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/269179">r269179</a> - [GTK] Direct composited images may not be rendered after a window resize
https://bugs.webkit.org/show_bug.cgi?id=218292

Reviewed by Carlos Garcia Campos.

Ensure that valid buffers passed for ImageBackings are not destroyed until the
CoordinatedGraphicsScene consumes them.

* platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp:
(Nicosia::ImageBackingTextureMapperImpl::flushUpdate):
* platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
(WebCore::CoordinatedGraphicsLayer::purgeBackingStores):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiatexmapNicosiaImageBackingTextureMapperImplcpp">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiatexmapNicosiaImageBackingTextureMapperImplh">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit230SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (270085 => 270086)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog  2020-11-20 10:36:40 UTC (rev 270085)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog     2020-11-20 10:36:58 UTC (rev 270086)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2020-10-30  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK] Direct composited images may not be rendered after a window resize
+        https://bugs.webkit.org/show_bug.cgi?id=218292
+
+        Reviewed by Carlos Garcia Campos.
+
+        Ensure that valid buffers passed for ImageBackings are not destroyed until the
+        CoordinatedGraphicsScene consumes them.
+
+        * platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp:
+        (Nicosia::ImageBackingTextureMapperImpl::flushUpdate):
+        * platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
+        (WebCore::CoordinatedGraphicsLayer::purgeBackingStores):
+
</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="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiatexmapNicosiaImageBackingTextureMapperImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp (270085 => 270086)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp  2020-11-20 10:36:40 UTC (rev 270085)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp     2020-11-20 10:36:58 UTC (rev 270086)
</span><span class="lines">@@ -47,6 +47,15 @@
</span><span class="cx"> void ImageBackingTextureMapperImpl::flushUpdate()
</span><span class="cx"> {
</span><span class="cx">     LockHolder locker(m_update.lock);
</span><ins>+
+    // If the update happens for the same image and there's no buffer, keep the current one
+    // so it can be received by the CoordinatedGraphicsScene. In that case we only need to update
+    // the isVisible flag.
+    if ((m_layerState.update.nativeImageID == m_update.update.nativeImageID) && !m_layerState.update.buffer) {
+        m_update.update.isVisible = m_layerState.update.isVisible;
+        return;
+    }
+
</ins><span class="cx">     m_update.update = WTFMove(m_layerState.update);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit230SourceWebCoreplatformgraphicsnicosiatexmapNicosiaImageBackingTextureMapperImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h (270085 => 270086)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h    2020-11-20 10:36:40 UTC (rev 270085)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h       2020-11-20 10:36:58 UTC (rev 270086)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">         bool isVisible { false };
</span><span class="cx">         RefPtr<Nicosia::Buffer> buffer;
</span><ins>+        uintptr_t nativeImageID { 0 };
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     // An immutable layer-side state object. flushUpdate() prepares
</span><span class="lines">@@ -72,7 +73,6 @@
</span><span class="cx">         LayerState& operator=(LayerState&&) = delete;
</span><span class="cx"> 
</span><span class="cx">         uintptr_t imageID { 0 };
</span><del>-        uintptr_t nativeImageID { 0 };
</del><span class="cx">         Update update;
</span><span class="cx">     };
</span><span class="cx">     LayerState& layerState() { return m_layerState; }
</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 (270085 => 270086)</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:36:40 UTC (rev 270085)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp     2020-11-20 10:36:58 UTC (rev 270086)
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx">         auto& layerState = impl.layerState();
</span><span class="cx">         layerState.imageID = imageID;
</span><span class="cx">         layerState.update.isVisible = transformedVisibleRect().intersects(IntRect(contentsRect()));
</span><del>-        if (layerState.update.isVisible && layerState.nativeImageID != nativeImageID) {
</del><ins>+        if (layerState.update.isVisible && layerState.update.nativeImageID != nativeImageID) {
</ins><span class="cx">             auto buffer = Nicosia::Buffer::create(IntSize(image.size()),
</span><span class="cx">                 !image.currentFrameKnownToBeOpaque() ? Nicosia::Buffer::SupportsAlpha : Nicosia::Buffer::NoFlags);
</span><span class="cx">             Nicosia::PaintingContext::paint(buffer,
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx">                     IntRect rect { { }, IntSize { image.size() } };
</span><span class="cx">                     context.drawImage(image, rect, rect, ImagePaintingOptions(CompositeOperator::Copy));
</span><span class="cx">                 });
</span><del>-            layerState.nativeImageID = nativeImageID;
</del><ins>+            layerState.update.nativeImageID = nativeImageID;
</ins><span class="cx">             layerState.update.buffer = WTFMove(buffer);
</span><span class="cx">             m_nicosia.delta.imageBackingChanged = true;
</span><span class="cx">         }
</span><span class="lines">@@ -1196,7 +1196,6 @@
</span><span class="cx">     if (m_nicosia.imageBacking) {
</span><span class="cx">         auto& layerState = downcast<Nicosia::ImageBackingTextureMapperImpl>(m_nicosia.imageBacking->impl()).layerState();
</span><span class="cx">         layerState.imageID = 0;
</span><del>-        layerState.nativeImageID = 0;
</del><span class="cx">         layerState.update = { };
</span><span class="cx"> 
</span><span class="cx">         m_nicosia.imageBacking = nullptr;
</span></span></pre>
</div>
</div>

</body>
</html>