<!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>[210152] trunk</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/210152">210152</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-26 19:14:31 -0800 (Mon, 26 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
https://bugs.webkit.org/show_bug.cgi?id=163461
Reviewed by Darin Adler.
Source/WebCore:
Make sure we don't paint empty rects.
Test: fast/lists/assert-on-empty-list-marker.html
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
LayoutTests:
* fast/lists/assert-on-empty-list-marker-expected.txt: Added.
* fast/lists/assert-on-empty-list-marker.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastlistsassertonemptylistmarkerexpectedtxt">trunk/LayoutTests/fast/lists/assert-on-empty-list-marker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastlistsassertonemptylistmarkerhtml">trunk/LayoutTests/fast/lists/assert-on-empty-list-marker.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210151 => 210152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-26 19:00:53 UTC (rev 210151)
+++ trunk/LayoutTests/ChangeLog 2016-12-27 03:14:31 UTC (rev 210152)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-26 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
+ https://bugs.webkit.org/show_bug.cgi?id=163461
+
+ Reviewed by Darin Adler.
+
+ * fast/lists/assert-on-empty-list-marker-expected.txt: Added.
+ * fast/lists/assert-on-empty-list-marker.html: Added.
+
</ins><span class="cx"> 2016-12-25 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Headers of table not read by VoiceOver
</span></span></pre></div>
<a id="trunkLayoutTestsfastlistsassertonemptylistmarkerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/lists/assert-on-empty-list-marker-expected.txt (0 => 210152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/lists/assert-on-empty-list-marker-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/lists/assert-on-empty-list-marker-expected.txt 2016-12-27 03:14:31 UTC (rev 210152)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no ASSERT in debug.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastlistsassertonemptylistmarkerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/lists/assert-on-empty-list-marker.html (0 => 210152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/lists/assert-on-empty-list-marker.html (rev 0)
+++ trunk/LayoutTests/fast/lists/assert-on-empty-list-marker.html 2016-12-27 03:14:31 UTC (rev 210152)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't assert on empty list markers.</title>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+PASS if no ASSERT in debug.
+<ul style=font-size:1px><ul><ul><li>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210151 => 210152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-26 19:00:53 UTC (rev 210151)
+++ trunk/Source/WebCore/ChangeLog 2016-12-27 03:14:31 UTC (rev 210152)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-26 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
+ https://bugs.webkit.org/show_bug.cgi?id=163461
+
+ Reviewed by Darin Adler.
+
+ Make sure we don't paint empty rects.
+
+ Test: fast/lists/assert-on-empty-list-marker.html
+
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint):
+
</ins><span class="cx"> 2016-12-25 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Headers of table not read by VoiceOver
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (210151 => 210152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2016-12-26 19:00:53 UTC (rev 210151)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2016-12-27 03:14:31 UTC (rev 210152)
</span><span class="lines">@@ -1189,14 +1189,16 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect box(boxOrigin, size());
</span><span class="cx">
</span><del>- FloatRect marker = getRelativeMarkerRect();
- marker.moveBy(boxOrigin);
</del><ins>+ auto markerRect = getRelativeMarkerRect();
+ markerRect.moveBy(boxOrigin);
+ if (markerRect.isEmpty())
+ return;
</ins><span class="cx">
</span><span class="cx"> GraphicsContext& context = paintInfo.context();
</span><span class="cx">
</span><span class="cx"> if (isImage()) {
</span><del>- if (RefPtr<Image> markerImage = m_image->image(this, marker.size()))
- context.drawImage(*markerImage, marker);
</del><ins>+ if (RefPtr<Image> markerImage = m_image->image(this, markerRect.size()))
+ context.drawImage(*markerImage, markerRect);
</ins><span class="cx"> if (selectionState() != SelectionNone) {
</span><span class="cx"> LayoutRect selRect = localSelectionRect();
</span><span class="cx"> selRect.moveBy(boxOrigin);
</span><span class="lines">@@ -1220,14 +1222,14 @@
</span><span class="cx"> EListStyleType type = style().listStyleType();
</span><span class="cx"> switch (type) {
</span><span class="cx"> case Disc:
</span><del>- context.drawEllipse(marker);
</del><ins>+ context.drawEllipse(markerRect);
</ins><span class="cx"> return;
</span><span class="cx"> case Circle:
</span><span class="cx"> context.setFillColor(Color::transparent);
</span><del>- context.drawEllipse(marker);
</del><ins>+ context.drawEllipse(markerRect);
</ins><span class="cx"> return;
</span><span class="cx"> case Square:
</span><del>- context.drawRect(marker);
</del><ins>+ context.drawRect(markerRect);
</ins><span class="cx"> return;
</span><span class="cx"> case NoneListStyle:
</span><span class="cx"> return;
</span><span class="lines">@@ -1318,16 +1320,16 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context, false);
</span><span class="cx"> if (!style().isHorizontalWritingMode()) {
</span><del>- marker.moveBy(-boxOrigin);
- marker = marker.transposedRect();
- marker.moveBy(FloatPoint(box.x(), box.y() - logicalHeight()));
</del><ins>+ markerRect.moveBy(-boxOrigin);
+ markerRect = markerRect.transposedRect();
+ markerRect.moveBy(FloatPoint(box.x(), box.y() - logicalHeight()));
</ins><span class="cx"> stateSaver.save();
</span><del>- context.translate(marker.x(), marker.maxY());
</del><ins>+ context.translate(markerRect.x(), markerRect.maxY());
</ins><span class="cx"> context.rotate(static_cast<float>(deg2rad(90.)));
</span><del>- context.translate(-marker.x(), -marker.maxY());
</del><ins>+ context.translate(-markerRect.x(), -markerRect.maxY());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- FloatPoint textOrigin = FloatPoint(marker.x(), marker.y() + style().fontMetrics().ascent());
</del><ins>+ FloatPoint textOrigin = FloatPoint(markerRect.x(), markerRect.y() + style().fontMetrics().ascent());
</ins><span class="cx"> textOrigin = roundPointToDevicePixels(LayoutPoint(textOrigin), document().deviceScaleFactor(), style().isLeftToRightDirection());
</span><span class="cx">
</span><span class="cx"> if (type == Asterisks || type == Footnotes)
</span></span></pre>
</div>
</div>
</body>
</html>