<!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>[279104] trunk/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/279104">279104</a></dd>
<dt>Author</dt> <dd>said@apple.com</dd>
<dt>Date</dt> <dd>2021-06-21 23:08:29 -0700 (Mon, 21 Jun 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GPU Process] RELEASE_ASSERT in RemoteResourceCacheProxy::didFinalizeRenderingUpdate() may fire if GPUP is relaunched
https://bugs.webkit.org/show_bug.cgi?id=227229
<rdar://79147947>
Reviewed by Myles C. Maxfield.
1) Remove maximumUnusedFontCountToSkipRemoval because
'unusedFontCount < maximumUnusedFontCountToSkipRemoval' can't be true
since both unusedFontCount and maximumUnusedFontCountToSkipRemoval are
unsigned and maximumUnusedFontCountToSkipRemoval is equal to zero.
So they can only be equal and we can replace this by '!unusedFontCount'.
2) RemoteResourceCacheProxy::cacheFont() assumes if the font is cached in
m_fontIdentifierToLastRenderingUpdateVersionMap then it is also cached
in GPUP. We have to keep this assumption correct by removing the
corresponding entries from m_fontIdentifierToLastRenderingUpdateVersionMap.
3) RemoteResourceCacheProxy::didFinalizeRenderingUpdate() needs to reset
m_numberOfFontsUsedInCurrentRenderingUpdate and to increment
m_currentRenderingUpdateVersion in all its code branches.
4) If the GPUP is relaunched, we need to set
m_numberOfFontsUsedInCurrentRenderingUpdate to zero after we clear
m_fontIdentifierToLastRenderingUpdateVersionMap. Otherwise the
RELEASE_ASSERT in RemoteResourceCacheProxy::didFinalizeRenderingUpdate()
will fire.
* WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
(WebKit::RemoteResourceCacheProxy::prepareForNextRenderingUpdate):
(WebKit::RemoteResourceCacheProxy::clearFontMap):
(WebKit::RemoteResourceCacheProxy::didFinalizeRenderingUpdate):
(WebKit::RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed):
(WebKit::RemoteResourceCacheProxy::releaseMemory):
* WebProcess/GPU/graphics/RemoteResourceCacheProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxycpp">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxyh">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (279103 => 279104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2021-06-22 04:57:23 UTC (rev 279103)
+++ trunk/Source/WebKit/ChangeLog 2021-06-22 06:08:29 UTC (rev 279104)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2021-06-21 Said Abou-Hallawa <said@apple.com>
+
+ [GPU Process] RELEASE_ASSERT in RemoteResourceCacheProxy::didFinalizeRenderingUpdate() may fire if GPUP is relaunched
+ https://bugs.webkit.org/show_bug.cgi?id=227229
+ <rdar://79147947>
+
+ Reviewed by Myles C. Maxfield.
+
+ 1) Remove maximumUnusedFontCountToSkipRemoval because
+ 'unusedFontCount < maximumUnusedFontCountToSkipRemoval' can't be true
+ since both unusedFontCount and maximumUnusedFontCountToSkipRemoval are
+ unsigned and maximumUnusedFontCountToSkipRemoval is equal to zero.
+ So they can only be equal and we can replace this by '!unusedFontCount'.
+
+ 2) RemoteResourceCacheProxy::cacheFont() assumes if the font is cached in
+ m_fontIdentifierToLastRenderingUpdateVersionMap then it is also cached
+ in GPUP. We have to keep this assumption correct by removing the
+ corresponding entries from m_fontIdentifierToLastRenderingUpdateVersionMap.
+
+ 3) RemoteResourceCacheProxy::didFinalizeRenderingUpdate() needs to reset
+ m_numberOfFontsUsedInCurrentRenderingUpdate and to increment
+ m_currentRenderingUpdateVersion in all its code branches.
+
+ 4) If the GPUP is relaunched, we need to set
+ m_numberOfFontsUsedInCurrentRenderingUpdate to zero after we clear
+ m_fontIdentifierToLastRenderingUpdateVersionMap. Otherwise the
+ RELEASE_ASSERT in RemoteResourceCacheProxy::didFinalizeRenderingUpdate()
+ will fire.
+
+ * WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
+ (WebKit::RemoteResourceCacheProxy::prepareForNextRenderingUpdate):
+ (WebKit::RemoteResourceCacheProxy::clearFontMap):
+ (WebKit::RemoteResourceCacheProxy::didFinalizeRenderingUpdate):
+ (WebKit::RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed):
+ (WebKit::RemoteResourceCacheProxy::releaseMemory):
+ * WebProcess/GPU/graphics/RemoteResourceCacheProxy.h:
+
</ins><span class="cx"> 2021-06-21 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> [macOS] [WebKitLegacy] Non-actionable "Look Up" action appears when right clicking images
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp (279103 => 279104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp 2021-06-22 04:57:23 UTC (rev 279103)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp 2021-06-22 06:08:29 UTC (rev 279104)
</span><span class="lines">@@ -105,15 +105,16 @@
</span><span class="cx"> void RemoteResourceCacheProxy::cacheFont(Font& font)
</span><span class="cx"> {
</span><span class="cx"> auto result = m_fontIdentifierToLastRenderingUpdateVersionMap.ensure(font.renderingResourceIdentifier(), [&] {
</span><del>- return 0;
</del><ins>+ m_remoteRenderingBackendProxy.cacheFont(makeRef(font));
+ ++m_numberOfFontsUsedInCurrentRenderingUpdate;
+ return m_currentRenderingUpdateVersion;
</ins><span class="cx"> });
</span><ins>+
</ins><span class="cx"> auto& lastVersion = result.iterator->value;
</span><span class="cx"> if (lastVersion != m_currentRenderingUpdateVersion) {
</span><span class="cx"> lastVersion = m_currentRenderingUpdateVersion;
</span><span class="cx"> ++m_numberOfFontsUsedInCurrentRenderingUpdate;
</span><span class="cx"> }
</span><del>- if (result.isNewEntry)
- m_remoteRenderingBackendProxy.cacheFont(makeRef(font));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteResourceCacheProxy::releaseNativeImage(RenderingResourceIdentifier renderingResourceIdentifier)
</span><span class="lines">@@ -125,25 +126,42 @@
</span><span class="cx"> m_remoteRenderingBackendProxy.releaseRemoteResource(renderingResourceIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RemoteResourceCacheProxy::prepareForNextRenderingUpdate()
+{
+ ++m_currentRenderingUpdateVersion;
+ m_numberOfFontsUsedInCurrentRenderingUpdate = 0;
+}
+
+void RemoteResourceCacheProxy::clearFontMap()
+{
+ m_fontIdentifierToLastRenderingUpdateVersionMap.clear();
+ m_numberOfFontsUsedInCurrentRenderingUpdate = 0;
+ m_currentRenderingUpdateVersion = 0;
+}
+
</ins><span class="cx"> void RemoteResourceCacheProxy::didFinalizeRenderingUpdate()
</span><span class="cx"> {
</span><span class="cx"> static constexpr unsigned minimumRenderingUpdateCountToKeepFontAlive = 4;
</span><span class="cx"> static constexpr double minimumFractionOfUnusedFontCountToTriggerRemoval = 0.25;
</span><del>- static constexpr unsigned maximumUnusedFontCountToSkipRemoval = 0;
</del><span class="cx">
</span><span class="cx"> unsigned totalFontCount = m_fontIdentifierToLastRenderingUpdateVersionMap.size();
</span><span class="cx"> RELEASE_ASSERT(m_numberOfFontsUsedInCurrentRenderingUpdate <= totalFontCount);
</span><ins>+
</ins><span class="cx"> unsigned unusedFontCount = totalFontCount - m_numberOfFontsUsedInCurrentRenderingUpdate;
</span><del>- if (unusedFontCount < minimumFractionOfUnusedFontCountToTriggerRemoval * totalFontCount && unusedFontCount <= maximumUnusedFontCountToSkipRemoval)
</del><ins>+ if (unusedFontCount <= minimumFractionOfUnusedFontCountToTriggerRemoval * totalFontCount) {
+ prepareForNextRenderingUpdate();
</ins><span class="cx"> return;
</span><del>-
- for (auto& item : m_fontIdentifierToLastRenderingUpdateVersionMap) {
- if (m_currentRenderingUpdateVersion - item.value >= minimumRenderingUpdateCountToKeepFontAlive)
- m_remoteRenderingBackendProxy.releaseRemoteResource(item.key);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- ++m_currentRenderingUpdateVersion;
- m_numberOfFontsUsedInCurrentRenderingUpdate = 0;
</del><ins>+ m_fontIdentifierToLastRenderingUpdateVersionMap.removeIf([&] (const auto& item) {
+ if (m_currentRenderingUpdateVersion - item.value < minimumRenderingUpdateCountToKeepFontAlive)
+ return false;
+
+ m_remoteRenderingBackendProxy.releaseRemoteResource(item.key);
+ return true;
+ });
+
+ prepareForNextRenderingUpdate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed()
</span><span class="lines">@@ -155,14 +173,13 @@
</span><span class="cx"> imageBuffer->clearBackend();
</span><span class="cx"> }
</span><span class="cx"> m_nativeImages.clear();
</span><del>- m_fontIdentifierToLastRenderingUpdateVersionMap.clear();
</del><ins>+ clearFontMap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteResourceCacheProxy::releaseMemory()
</span><span class="cx"> {
</span><del>- m_fontIdentifierToLastRenderingUpdateVersionMap.clear();
- m_numberOfFontsUsedInCurrentRenderingUpdate = 0;
</del><span class="cx"> m_remoteRenderingBackendProxy.deleteAllFonts();
</span><ins>+ clearFontMap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.h (279103 => 279104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.h 2021-06-22 04:57:23 UTC (rev 279103)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.h 2021-06-22 06:08:29 UTC (rev 279104)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> using NativeImageHashMap = HashMap<WebCore::RenderingResourceIdentifier, WeakPtr<WebCore::NativeImage>>;
</span><span class="cx">
</span><span class="cx"> void releaseNativeImage(WebCore::RenderingResourceIdentifier) override;
</span><ins>+ void prepareForNextRenderingUpdate();
+ void clearFontMap();
</ins><span class="cx">
</span><span class="cx"> ImageBufferHashMap m_imageBuffers;
</span><span class="cx"> NativeImageHashMap m_nativeImages;
</span></span></pre>
</div>
</div>
</body>
</html>