<!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>[209177] trunk/Source/WebKit2</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/209177">209177</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 23:51:51 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] UI process crash in WebKit::WaylandCompositor::Surface::prepareTextureForPainting
https://bugs.webkit.org/show_bug.cgi?id=164911
Reviewed by Michael Catanzaro.
The problem is that m_buffer is nullptr in Surface::prepareTextureForPainting() even though we have already an
image. We only use the buffer to get the image size, so we could save the image size when the image is created,
and then we don't need to care about the buffer anymore.
* UIProcess/gtk/WaylandCompositor.cpp:
(WebKit::WaylandCompositor::Surface::prepareTextureForPainting):
(WebKit::WaylandCompositor::Surface::commit):
* UIProcess/gtk/WaylandCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWaylandCompositorcpp">trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWaylandCompositorh">trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209176 => 209177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-01 07:05:42 UTC (rev 209176)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-01 07:51:51 UTC (rev 209177)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] UI process crash in WebKit::WaylandCompositor::Surface::prepareTextureForPainting
+ https://bugs.webkit.org/show_bug.cgi?id=164911
+
+ Reviewed by Michael Catanzaro.
+
+ The problem is that m_buffer is nullptr in Surface::prepareTextureForPainting() even though we have already an
+ image. We only use the buffer to get the image size, so we could save the image size when the image is created,
+ and then we don't need to care about the buffer anymore.
+
+ * UIProcess/gtk/WaylandCompositor.cpp:
+ (WebKit::WaylandCompositor::Surface::prepareTextureForPainting):
+ (WebKit::WaylandCompositor::Surface::commit):
+ * UIProcess/gtk/WaylandCompositor.h:
+
</ins><span class="cx"> 2016-11-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Add an HTML comment flag to turn the feature on
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWaylandCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (209176 => 209177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-12-01 07:05:42 UTC (rev 209176)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-12-01 07:51:51 UTC (rev 209177)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> glImageTargetTexture2D(GL_TEXTURE_2D, m_image);
</span><span class="cx">
</span><span class="cx"> texture = m_texture;
</span><del>- textureSize = m_buffer->size();
</del><ins>+ textureSize = m_imageSize;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,6 +227,8 @@
</span><span class="cx"> if (m_image == EGL_NO_IMAGE_KHR)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_imageSize = m_pendingBuffer->size();
+
</ins><span class="cx"> makePendingBufferCurrent();
</span><span class="cx"> if (m_webPage)
</span><span class="cx"> m_webPage->setViewNeedsDisplay(IntRect(IntPoint::zero(), m_webPage->viewSize()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWaylandCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h (209176 => 209177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-12-01 07:05:42 UTC (rev 209176)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-12-01 07:51:51 UTC (rev 209177)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> WeakPtr<Buffer> m_pendingBuffer;
</span><span class="cx"> unsigned m_texture;
</span><span class="cx"> EGLImageKHR m_image;
</span><ins>+ WebCore::IntSize m_imageSize;
</ins><span class="cx"> Vector<wl_resource*> m_frameCallbackList;
</span><span class="cx"> WebPageProxy* m_webPage { nullptr };
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>