<!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>[198142] 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/198142">198142</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 11:13:02 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Negative outline offset could break curved outline-style: auto
https://bugs.webkit.org/show_bug.cgi?id=155416
Reviewed by Tim Horton.
When radius becomes negative the rounded rect could end up being un-renderable -> no rounded corners at all.
Source/WebCore:
Test: fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html
* platform/graphics/PathUtilities.cpp:
(WebCore::adjustedtRadiiForHuggingCurve):
LayoutTests:
* fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html: Added.
* fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.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="#trunkSourceWebCoreplatformgraphicsPathUtilitiescpp">trunk/Source/WebCore/platform/graphics/PathUtilities.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinehidpioutlineautonegativeoffsetwithborderradiusexpectedhtml">trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastinlinehidpioutlineautonegativeoffsetwithborderradiushtml">trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198141 => 198142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-14 18:09:54 UTC (rev 198141)
+++ trunk/LayoutTests/ChangeLog 2016-03-14 18:13:02 UTC (rev 198142)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-03-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Negative outline offset could break curved outline-style: auto
+ https://bugs.webkit.org/show_bug.cgi?id=155416
+
+ Reviewed by Tim Horton.
+
+ When radius becomes negative the rounded rect could end up being un-renderable -> no rounded corners at all.
+
+ * fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html: Added.
+ * fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html: Added.
+
+2016-03-14 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> [Outline: auto] Fractional radius value could result in non-renderable rounded border.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155420
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpioutlineautonegativeoffsetwithborderradiusexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html (0 => 198142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius-expected.html 2016-03-14 18:13:02 UTC (rev 198142)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests hugging outlines with negative offset.</title>
+</head>
+<body></body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpioutlineautonegativeoffsetwithborderradiushtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html (0 => 198142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html 2016-03-14 18:13:02 UTC (rev 198142)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests hugging outlines with negative offset.</title>
+<style>
+div {
+ position: absolute;
+ border-radius: 30px 10px 10px 10px;
+}
+
+.outline-radius {
+ outline-style: auto;
+ outline-offset: -15px;
+ top: 0px;
+ left: 0px;
+ width: 200px;
+ height: 200px;
+}
+
+.cover {
+ border: 6px solid white;
+ border-radius: 18px 2px 2px 2px;
+ top: 11px;
+ left: 11px;
+ width: 166px;
+ height: 166px;
+}
+</style>
+</head>
+<body>
+<div class=outline-radius></div>
+<div class=cover></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198141 => 198142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-14 18:09:54 UTC (rev 198141)
+++ trunk/Source/WebCore/ChangeLog 2016-03-14 18:13:02 UTC (rev 198142)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-03-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Negative outline offset could break curved outline-style: auto
+ https://bugs.webkit.org/show_bug.cgi?id=155416
+
+ Reviewed by Tim Horton.
+
+ When radius becomes negative the rounded rect could end up being un-renderable -> no rounded corners at all.
+
+ Test: fast/inline/hidpi-outline-auto-negative-offset-with-border-radius.html
+
+ * platform/graphics/PathUtilities.cpp:
+ (WebCore::adjustedtRadiiForHuggingCurve):
+
+2016-03-14 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> [Outline: auto] Fractional radius value could result in non-renderable rounded border.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155420
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PathUtilities.cpp (198141 => 198142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-03-14 18:09:54 UTC (rev 198141)
+++ trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-03-14 18:13:02 UTC (rev 198142)
</span><span class="lines">@@ -444,12 +444,15 @@
</span><span class="cx"> // This adjusts the radius so that it follows the border curve even when offset is present.
</span><span class="cx"> auto adjustedRadius = [outlineOffset](const FloatSize& radius)
</span><span class="cx"> {
</span><del>- FloatSize adjustedRadius = radius;
</del><ins>+ FloatSize expandSize;
</ins><span class="cx"> if (radius.width() > outlineOffset)
</span><del>- adjustedRadius.expand(std::min(outlineOffset, radius.width() - outlineOffset), 0);
</del><ins>+ expandSize.setWidth(std::min(outlineOffset, radius.width() - outlineOffset));
</ins><span class="cx"> if (radius.height() > outlineOffset)
</span><del>- adjustedRadius.expand(0, std::min(outlineOffset, radius.height() - outlineOffset));
- return adjustedRadius;
</del><ins>+ expandSize.setHeight(std::min(outlineOffset, radius.height() - outlineOffset));
+ FloatSize adjustedRadius = radius;
+ adjustedRadius.expand(expandSize.width(), expandSize.height());
+ // Do not go to negative radius.
+ return adjustedRadius.expandedTo(FloatSize(0, 0));
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> radii.setTopLeft(adjustedRadius(topLeftRadius));
</span></span></pre>
</div>
</div>
</body>
</html>