<!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>[195197] releases/WebKitGTK/webkit-2.10</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/195197">195197</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 03:41:34 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194418">r194418</a> - ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
https://bugs.webkit.org/show_bug.cgi?id=151210
Reviewed by Simon Fraser.
Source/WebCore:
"IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect first and
returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
the snapped rect might become smaller than the inner rect.
This patch also enables outline painting on subpixel positions.
Tests: fast/borders/hidpi-outline-on-subpixel-position.html
fast/borders/outline-offset-overflow.html
* rendering/RenderElement.cpp:
(WebCore::RenderElement::paintOutline):
LayoutTests:
"IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect and
returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
the snapped outer rect becomes smaller than the inner rect.
This patch also enables outline painting on subpixel positions.
* fast/borders/hidpi-outline-on-subpixel-position-expected.html: Added.
* fast/borders/hidpi-outline-on-subpixel-position.html: Added.
* fast/borders/outline-offset-overflow-expected.txt: Added.
* fast/borders/outline-offset-overflow.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderElementcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastbordershidpioutlineonsubpixelpositionexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastbordershidpioutlineonsubpixelpositionhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastbordersoutlineoffsetoverflowexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastbordersoutlineoffsetoverflowhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195196 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 11:36:45 UTC (rev 195196)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-24 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
+ https://bugs.webkit.org/show_bug.cgi?id=151210
+
+ Reviewed by Simon Fraser.
+
+ "IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect and
+ returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
+ the snapped outer rect becomes smaller than the inner rect.
+
+ This patch also enables outline painting on subpixel positions.
+
+ * fast/borders/hidpi-outline-on-subpixel-position-expected.html: Added.
+ * fast/borders/hidpi-outline-on-subpixel-position.html: Added.
+ * fast/borders/outline-offset-overflow-expected.txt: Added.
+ * fast/borders/outline-offset-overflow.html: Added.
+
</ins><span class="cx"> 2015-12-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r187593): Scroll position jumps when selecting text in an iframe
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastbordershidpioutlineonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position-expected.html (0 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position-expected.html 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests outlines on subpixel positions</title>
+<style>
+ div {
+ position: absolute;
+ height: 5px;
+ width: 5px;
+ left: 1px;
+ top: 1px;
+ border: solid 1px green;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ var leftPos = 0;
+ var topPos = 0;
+ var subpixelOffset = 0;
+ for (var i = 0; i < 50; ++i) {
+ var e = document.createElement("div");
+ e.style.left = leftPos + "px";
+ e.style.top = topPos + "px";
+ container.appendChild(e);
+ subpixelOffset += 0.1;
+ leftPos += 5 + subpixelOffset;
+ topPos += 5 + subpixelOffset;
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastbordershidpioutlineonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position.html (0 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/hidpi-outline-on-subpixel-position.html 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests outlines on subpixel positions</title>
+<style>
+ div {
+ position: absolute;
+ height: 5px;
+ width: 5px;
+ left: 1px;
+ top: 1px;
+ outline: solid 1px green;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ var leftPos = 1;
+ var topPos = 1;
+ var subpixelOffset = 0;
+ for (var i = 0; i < 50; ++i) {
+ var e = document.createElement("div");
+ e.style.left = leftPos + "px";
+ e.style.top = topPos + "px";
+ container.appendChild(e);
+ subpixelOffset += 0.1;
+ leftPos += 5 + subpixelOffset;
+ topPos += 5 + subpixelOffset;
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastbordersoutlineoffsetoverflowexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow-expected.txt (0 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow-expected.txt 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no assert in debug.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastbordersoutlineoffsetoverflowhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow.html (0 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/borders/outline-offset-overflow.html 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+div {
+ outline-style: solid;
+ outline-offset: 46392551rem;
+}
+</style>
+<div>Pass if no assert in debug.</div>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195196 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 11:36:45 UTC (rev 195196)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-24 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
+ https://bugs.webkit.org/show_bug.cgi?id=151210
+
+ Reviewed by Simon Fraser.
+
+ "IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect first and
+ returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
+ the snapped rect might become smaller than the inner rect.
+
+ This patch also enables outline painting on subpixel positions.
+
+ Tests: fast/borders/hidpi-outline-on-subpixel-position.html
+ fast/borders/outline-offset-overflow.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::paintOutline):
+
</ins><span class="cx"> 2015-12-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r187593): Scroll position jumps when selecting text in an iframe
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderElement.cpp (195196 => 195197)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderElement.cpp 2016-01-18 11:36:45 UTC (rev 195196)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderElement.cpp 2016-01-18 11:41:34 UTC (rev 195197)
</span><span class="lines">@@ -2068,12 +2068,11 @@
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() || styleToUse.outlineStyle() == BNONE)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- IntRect inner = snappedIntRect(paintRect);
- inner.inflate(outlineOffset);
</del><ins>+ FloatRect outer = paintRect;
+ outer.inflate(outlineOffset + outlineWidth);
+ FloatRect inner = outer;
+ inner.inflate(-outlineWidth);
</ins><span class="cx">
</span><del>- IntRect outer = snappedIntRect(inner);
- outer.inflate(outlineWidth);
-
</del><span class="cx"> // FIXME: This prevents outlines from painting inside the object. See bug 12042
</span><span class="cx"> if (outer.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -2097,14 +2096,14 @@
</span><span class="cx"> outlineColor = Color(outlineColor.red(), outlineColor.green(), outlineColor.blue());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int leftOuter = outer.x();
- int leftInner = inner.x();
- int rightOuter = outer.maxX();
- int rightInner = inner.maxX();
- int topOuter = outer.y();
- int topInner = inner.y();
- int bottomOuter = outer.maxY();
- int bottomInner = inner.maxY();
</del><ins>+ float leftOuter = outer.x();
+ float leftInner = inner.x();
+ float rightOuter = outer.maxX();
+ float rightInner = std::min(inner.maxX(), rightOuter);
+ float topOuter = outer.y();
+ float topInner = inner.y();
+ float bottomOuter = outer.maxY();
+ float bottomInner = std::min(inner.maxY(), bottomOuter);
</ins><span class="cx">
</span><span class="cx"> drawLineForBoxSide(graphicsContext, FloatRect(FloatPoint(leftOuter, topOuter), FloatPoint(leftInner, bottomOuter)), BSLeft, outlineColor, outlineStyle, outlineWidth, outlineWidth);
</span><span class="cx"> drawLineForBoxSide(graphicsContext, FloatRect(FloatPoint(leftOuter, topOuter), FloatPoint(rightOuter, topInner)), BSTop, outlineColor, outlineStyle, outlineWidth, outlineWidth);
</span></span></pre>
</div>
</div>
</body>
</html>