<!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>[280816] branches/safari-612.1.27.3-branch/Source/WebKit</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/280816">280816</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-08-09 18:00:28 -0700 (Mon, 09 Aug 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280753">r280753</a>. rdar://problem/81700429
Page on mhlw.go.jp triggers WebContent termination by GPU process
https://bugs.webkit.org/show_bug.cgi?id=228885
<rdar://81603231>
Reviewed by Wenson Hsieh.
https://www.mhlw.go.jp/stf/seisakunitsuite/bunya/0000164708_00001.html triggered an issue
where RemoteRenderingBackend::finalizeRenderingUpdate() would be called when the
GPU process had just processed a "switching to next item buffer" meta command,
but had not yet received the new item buffer. This triggered the
MESSAGE_CHECK(initialHandle, "Missing initial shared display list handle");
in RemoteRenderingBackend::wakeUpAndApplyDisplayList().
Protect against this by having finalizeRenderingUpdate() check that
arguments.itemBufferIdentifier had been received, which is similar to what happens
inside the loop in wakeUpAndApplyDisplayList() already.
Not easily testable.
* GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::finalizeRenderingUpdate):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280753 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121273branchSourceWebKitChangeLog">branches/safari-612.1.27.3-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6121273branchSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp">branches/safari-612.1.27.3-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121273branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.3-branch/Source/WebKit/ChangeLog (280815 => 280816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.3-branch/Source/WebKit/ChangeLog 2021-08-10 00:59:25 UTC (rev 280815)
+++ branches/safari-612.1.27.3-branch/Source/WebKit/ChangeLog 2021-08-10 01:00:28 UTC (rev 280816)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2021-08-09 Russell Epstein <repstein@apple.com>
+
+ Cherry-pick r280753. rdar://problem/81700429
+
+ Page on mhlw.go.jp triggers WebContent termination by GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=228885
+ <rdar://81603231>
+
+ Reviewed by Wenson Hsieh.
+
+ https://www.mhlw.go.jp/stf/seisakunitsuite/bunya/0000164708_00001.html triggered an issue
+ where RemoteRenderingBackend::finalizeRenderingUpdate() would be called when the
+ GPU process had just processed a "switching to next item buffer" meta command,
+ but had not yet received the new item buffer. This triggered the
+ MESSAGE_CHECK(initialHandle, "Missing initial shared display list handle");
+ in RemoteRenderingBackend::wakeUpAndApplyDisplayList().
+
+ Protect against this by having finalizeRenderingUpdate() check that
+ arguments.itemBufferIdentifier had been received, which is similar to what happens
+ inside the loop in wakeUpAndApplyDisplayList() already.
+
+ Not easily testable.
+
+ * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+ (WebKit::RemoteRenderingBackend::finalizeRenderingUpdate):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-06 Simon Fraser <simon.fraser@apple.com>
+
+ Page on mhlw.go.jp triggers WebContent termination by GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=228885
+ <rdar://81603231>
+
+ Reviewed by Wenson Hsieh.
+
+ https://www.mhlw.go.jp/stf/seisakunitsuite/bunya/0000164708_00001.html triggered an issue
+ where RemoteRenderingBackend::finalizeRenderingUpdate() would be called when the
+ GPU process had just processed a "switching to next item buffer" meta command,
+ but had not yet received the new item buffer. This triggered the
+ MESSAGE_CHECK(initialHandle, "Missing initial shared display list handle");
+ in RemoteRenderingBackend::wakeUpAndApplyDisplayList().
+
+ Protect against this by having finalizeRenderingUpdate() check that
+ arguments.itemBufferIdentifier had been received, which is similar to what happens
+ inside the loop in wakeUpAndApplyDisplayList() already.
+
+ Not easily testable.
+
+ * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+ (WebKit::RemoteRenderingBackend::finalizeRenderingUpdate):
+
</ins><span class="cx"> 2021-08-03 Russell Epstein <repstein@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r280603. rdar://problem/81473647
</span></span></pre></div>
<a id="branchessafari6121273branchSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.3-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (280815 => 280816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.3-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-08-10 00:59:25 UTC (rev 280815)
+++ branches/safari-612.1.27.3-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-08-10 01:00:28 UTC (rev 280816)
</span><span class="lines">@@ -521,8 +521,13 @@
</span><span class="cx">
</span><span class="cx"> void RemoteRenderingBackend::finalizeRenderingUpdate(RenderingUpdateID renderingUpdateID)
</span><span class="cx"> {
</span><del>- if (m_pendingWakeupInfo && m_remoteResourceCache.cachedImageBuffer(m_pendingWakeupInfo->arguments.destinationImageBufferIdentifier))
</del><ins>+ auto shouldPerformWakeup = [&](const GPUProcessWakeupMessageArguments& arguments) {
+ return m_remoteResourceCache.cachedImageBuffer(arguments.destinationImageBufferIdentifier) && m_sharedDisplayListHandles.contains(arguments.itemBufferIdentifier);
+ };
+
+ if (m_pendingWakeupInfo && shouldPerformWakeup(m_pendingWakeupInfo->arguments))
</ins><span class="cx"> wakeUpAndApplyDisplayList(std::exchange(m_pendingWakeupInfo, std::nullopt)->arguments);
</span><ins>+
</ins><span class="cx"> send(Messages::RemoteRenderingBackendProxy::DidFinalizeRenderingUpdate(renderingUpdateID), m_renderingBackendIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>