<!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>[270051] trunk/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/270051">270051</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2020-11-19 14:11:45 -0800 (Thu, 19 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>ASSERT NOT REACHED in WebCore::DisplayList::DrawImageBuffer::apply seen with TestWebKitAPI.DisplayListTests.ReplayWithMissingResource
https://bugs.webkit.org/show_bug.cgi?id=219175

Reviewed by Tim Horton.

We're currently hitting debug assertions when applying native image and image buffer display list items after
<a href="http://trac.webkit.org/projects/webkit/changeset/270002">r270002</a>, due to the fact that `applyImageBufferItem` and `applyNativeImageItem` return `WTF::nullopt` in the
case where the image resources are present, so we proceed by attempting to apply the item with only the graphics
context.

Fix this by checking the item type and always return early after calling either `applyImageBufferItem` or
`applyNativeImageItem`.

* platform/graphics/displaylists/DisplayListReplayer.cpp:
(WebCore::DisplayList::applyImageBufferItem):
(WebCore::DisplayList::applyNativeImageItem):
(WebCore::DisplayList::Replayer::applyItem):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListReplayercpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (270050 => 270051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-19 22:08:57 UTC (rev 270050)
+++ trunk/Source/WebCore/ChangeLog      2020-11-19 22:11:45 UTC (rev 270051)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        ASSERT NOT REACHED in WebCore::DisplayList::DrawImageBuffer::apply seen with TestWebKitAPI.DisplayListTests.ReplayWithMissingResource
+        https://bugs.webkit.org/show_bug.cgi?id=219175
+
+        Reviewed by Tim Horton.
+
+        We're currently hitting debug assertions when applying native image and image buffer display list items after
+        r270002, due to the fact that `applyImageBufferItem` and `applyNativeImageItem` return `WTF::nullopt` in the
+        case where the image resources are present, so we proceed by attempting to apply the item with only the graphics
+        context.
+
+        Fix this by checking the item type and always return early after calling either `applyImageBufferItem` or
+        `applyNativeImageItem`.
+
+        * platform/graphics/displaylists/DisplayListReplayer.cpp:
+        (WebCore::DisplayList::applyImageBufferItem):
+        (WebCore::DisplayList::applyNativeImageItem):
+        (WebCore::DisplayList::Replayer::applyItem):
+
</ins><span class="cx"> 2020-11-19  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][Integration] Do not stretch the border box with the scrollbars
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListReplayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp (270050 => 270051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp      2020-11-19 22:08:57 UTC (rev 270050)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp 2020-11-19 22:11:45 UTC (rev 270051)
</span><span class="lines">@@ -48,8 +48,6 @@
</span><span class="cx"> template<class T>
</span><span class="cx"> inline static Optional<StopReplayReason> applyImageBufferItem(GraphicsContext& context, const ImageBufferHashMap& imageBuffers, ItemHandle item)
</span><span class="cx"> {
</span><del>-    if (!item.is<T>())
-        return WTF::nullopt;
</del><span class="cx">     auto& imageBufferItem = item.get<T>();
</span><span class="cx">     if (auto* imageBuffer = imageBuffers.get(imageBufferItem.imageBufferIdentifier())) {
</span><span class="cx">         imageBufferItem.apply(context, *imageBuffer);
</span><span class="lines">@@ -61,8 +59,6 @@
</span><span class="cx"> template<class T>
</span><span class="cx"> inline static Optional<StopReplayReason> applyNativeImageItem(GraphicsContext& context, const NativeImageHashMap& nativeImages, ItemHandle item)
</span><span class="cx"> {
</span><del>-    if (!item.is<T>())
-        return WTF::nullopt;
</del><span class="cx">     auto& nativeImageItem = item.get<T>();
</span><span class="cx">     if (auto* image = nativeImages.get(nativeImageItem.imageIdentifier())) {
</span><span class="cx">         nativeImageItem.apply(context, *image);
</span><span class="lines">@@ -76,17 +72,17 @@
</span><span class="cx">     if (m_delegate && m_delegate->apply(item, m_context))
</span><span class="cx">         return WTF::nullopt;
</span><span class="cx"> 
</span><del>-    if (auto reasonForStopping = applyImageBufferItem<DrawImageBuffer>(m_context, m_imageBuffers, item))
-        return reasonForStopping;
</del><ins>+    if (item.is<DrawImageBuffer>())
+        return applyImageBufferItem<DrawImageBuffer>(m_context, m_imageBuffers, item);
</ins><span class="cx"> 
</span><del>-    if (auto reasonForStopping = applyImageBufferItem<ClipToImageBuffer>(m_context, m_imageBuffers, item))
-        return reasonForStopping;
</del><ins>+    if (item.is<ClipToImageBuffer>())
+        return applyImageBufferItem<ClipToImageBuffer>(m_context, m_imageBuffers, item);
</ins><span class="cx"> 
</span><del>-    if (auto reasonForStopping = applyNativeImageItem<DrawNativeImage>(m_context, m_nativeImages, item))
-        return reasonForStopping;
</del><ins>+    if (item.is<DrawNativeImage>())
+        return applyNativeImageItem<DrawNativeImage>(m_context, m_nativeImages, item);
</ins><span class="cx"> 
</span><del>-    if (auto reasonForStopping = applyNativeImageItem<DrawPattern>(m_context, m_nativeImages, item))
-        return reasonForStopping;
</del><ins>+    if (item.is<DrawPattern>())
+        return applyNativeImageItem<DrawPattern>(m_context, m_nativeImages, item);
</ins><span class="cx"> 
</span><span class="cx">     item.apply(m_context);
</span><span class="cx">     return WTF::nullopt;
</span></span></pre>
</div>
</div>

</body>
</html>