<!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>[194002] 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/194002">194002</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 19:26:36 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
https://bugs.webkit.org/show_bug.cgi?id=151201
Reviewed by Simon Fraser.
Drawing empty rect is a waste.
Source/WebCore:
Test: fast/borders/empty-drawrect-assert-after-pixelsnap.html
* rendering/RenderElement.cpp:
(WebCore::RenderElement::drawLineForBoxSide):
LayoutTests:
* fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt: Added.
* fast/borders/empty-drawrect-assert-after-pixelsnap.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="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastbordersemptydrawrectassertafterpixelsnapexpectedtxt">trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastbordersemptydrawrectassertafterpixelsnaphtml">trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194001 => 194002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-12 02:26:45 UTC (rev 194001)
+++ trunk/LayoutTests/ChangeLog 2015-12-12 03:26:36 UTC (rev 194002)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-11 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
+ https://bugs.webkit.org/show_bug.cgi?id=151201
+
+ Reviewed by Simon Fraser.
+
+ Drawing empty rect is a waste.
+
+ * fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt: Added.
+ * fast/borders/empty-drawrect-assert-after-pixelsnap.html: Added.
+
</ins><span class="cx"> 2015-12-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Strip out Referer header when requesting subresources or following links for documents with "Content-Disposition: attachment"
</span></span></pre></div>
<a id="trunkLayoutTestsfastbordersemptydrawrectassertafterpixelsnapexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt (0 => 194002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap-expected.txt 2015-12-12 03:26:36 UTC (rev 194002)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no assert in debug.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastbordersemptydrawrectassertafterpixelsnaphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap.html (0 => 194002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap.html (rev 0)
+++ trunk/LayoutTests/fast/borders/empty-drawrect-assert-after-pixelsnap.html 2015-12-12 03:26:36 UTC (rev 194002)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+h3 {
+ border-top : 1px solid red;
+}
+* {
+ padding-inline-start : 91%;
+ -webkit-padding-start : 91%;
+ margin: auto auto;
+}
+</style>
+Pass if no assert in debug.
+<h3><dt><h3></h3></dt></h3>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194001 => 194002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-12 02:26:45 UTC (rev 194001)
+++ trunk/Source/WebCore/ChangeLog 2015-12-12 03:26:36 UTC (rev 194002)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-11 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
+ https://bugs.webkit.org/show_bug.cgi?id=151201
+
+ Reviewed by Simon Fraser.
+
+ Drawing empty rect is a waste.
+
+ Test: fast/borders/empty-drawrect-assert-after-pixelsnap.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::drawLineForBoxSide):
+
</ins><span class="cx"> 2015-12-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Strip out Referer header when requesting subresources or following links for documents with "Content-Disposition: attachment"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (194001 => 194002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-12-12 02:26:45 UTC (rev 194001)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-12-12 03:26:36 UTC (rev 194002)
</span><span class="lines">@@ -1825,6 +1825,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::drawLineForBoxSide(GraphicsContext& graphicsContext, const FloatRect& rect, BoxSide side, Color color, EBorderStyle borderStyle, float adjacentWidth1, float adjacentWidth2, bool antialias) const
</span><span class="cx"> {
</span><ins>+ auto drawBorderRect = [&graphicsContext] (const FloatRect& rect)
+ {
+ if (rect.isEmpty())
+ return;
+ graphicsContext.drawRect(rect);
+ };
+
</ins><span class="cx"> float x1 = rect.x();
</span><span class="cx"> float x2 = rect.maxX();
</span><span class="cx"> float y1 = rect.y();
</span><span class="lines">@@ -1879,13 +1886,13 @@
</span><span class="cx"> switch (side) {
</span><span class="cx"> case BSTop:
</span><span class="cx"> case BSBottom:
</span><del>- graphicsContext.drawRect(snapRectToDevicePixels(x1, y1, length, thirdOfThickness, deviceScaleFactor));
- graphicsContext.drawRect(snapRectToDevicePixels(x1, y2 - thirdOfThickness, length, thirdOfThickness, deviceScaleFactor));
</del><ins>+ drawBorderRect(snapRectToDevicePixels(x1, y1, length, thirdOfThickness, deviceScaleFactor));
+ drawBorderRect(snapRectToDevicePixels(x1, y2 - thirdOfThickness, length, thirdOfThickness, deviceScaleFactor));
</ins><span class="cx"> break;
</span><span class="cx"> case BSLeft:
</span><span class="cx"> case BSRight:
</span><del>- graphicsContext.drawRect(snapRectToDevicePixels(x1, y1, thirdOfThickness, length, deviceScaleFactor));
- graphicsContext.drawRect(snapRectToDevicePixels(x2 - thirdOfThickness, y1, thirdOfThickness, length, deviceScaleFactor));
</del><ins>+ drawBorderRect(snapRectToDevicePixels(x1, y1, thirdOfThickness, length, deviceScaleFactor));
+ drawBorderRect(snapRectToDevicePixels(x2 - thirdOfThickness, y1, thirdOfThickness, length, deviceScaleFactor));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2025,7 +2032,7 @@
</span><span class="cx"> graphicsContext.setFillColor(color);
</span><span class="cx"> bool wasAntialiased = graphicsContext.shouldAntialias();
</span><span class="cx"> graphicsContext.setShouldAntialias(antialias);
</span><del>- graphicsContext.drawRect(snapRectToDevicePixels(x1, y1, x2 - x1, y2 - y1, deviceScaleFactor));
</del><ins>+ drawBorderRect(snapRectToDevicePixels(x1, y1, x2 - x1, y2 - y1, deviceScaleFactor));
</ins><span class="cx"> graphicsContext.setShouldAntialias(wasAntialiased);
</span><span class="cx"> graphicsContext.setStrokeStyle(oldStrokeStyle);
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>