<!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>[167659] 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/167659">167659</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-04-22 07:17:43 -0700 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>border-style: double rendered as solid when combined with border-radius
https://bugs.webkit.org/show_bug.cgi?id=131927
Reviewed by Simon Fraser.
BorderEdge::getDoubleBorderStripeWidths() should return the calculated inner, outer border widths.
Source/WebCore:
Test: fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html
* rendering/BorderEdge.cpp:
(WebCore::BorderEdge::getDoubleBorderStripeWidths):
* rendering/BorderEdge.h:
LayoutTests:
* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html: Added.
* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.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="#trunkSourceWebCorerenderingBorderEdgecpp">trunk/Source/WebCore/rendering/BorderEdge.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingBorderEdgeh">trunk/Source/WebCore/rendering/BorderEdge.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastbordershidpidoubleborderwithborderradiusalwaysproducesolidlineexpectedhtml">trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastbordershidpidoubleborderwithborderradiusalwaysproducesolidlinehtml">trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167658 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/LayoutTests/ChangeLog        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-22 Zalan Bujtas <zalan@apple.com>
+
+ border-style: double rendered as solid when combined with border-radius
+ https://bugs.webkit.org/show_bug.cgi?id=131927
+
+ Reviewed by Simon Fraser.
+
+ BorderEdge::getDoubleBorderStripeWidths() should return the calculated inner, outer border widths.
+
+ * fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html: Added.
+ * fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html: Added.
+
</ins><span class="cx"> 2014-04-22 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastbordershidpidoubleborderwithborderradiusalwaysproducesolidlineexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html (0 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests if double borders with radius paint doubles instead of solid single borders.</title>
+<style>
+ div {
+ border-style: solid;
+ border-color: red;
+ }
+</style>
+</head>
+<body>
+ <div style="width: 20px; height: 20px; border-width: 0.5px; border-radius: 1px"></div></br>
+ <div style="width: 20px; height: 20px; border-width: 1px; border-radius: 5px"></div></br>
+ <div style="width: 20px; height: 20px; border-width: 1px; position: fixed; top: 89px; left: 10px"></div></br>
+ <div style="width: 20px; height: 20px; border-width: 1px; position: fixed; top: 133.5px; left: 10.5px"></div></br>
+ <div style="width: 20px; height: 20px; border-width: 1px; position: fixed; top: 179px; left: 11px"></div></br>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastbordershidpidoubleborderwithborderradiusalwaysproducesolidlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html (0 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html         (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests if double borders with radius paint doubles instead of solid single borders.</title>
+<style>
+ .outer {
+ width: 20px;
+ height: 20px;
+ border-style: double;
+ border-color: red;
+ }
+
+ .cover {
+ border: solid white 1px;
+ position: relative;
+ }
+</style>
+</head>
+<body>
+ <div class=outer style="border-width: 0.5px; border-radius: 1px"></div></br>
+ <div class=outer style="border-width: 1px; border-radius: 5px"></div></br>
+ <div class=outer style="border-width: 3px; border-radius: 1px"><div class=cover style=" top: -3px; left: -3px; width: 24px; height: 24px;"></div></div></br>
+ <div class=outer style="border-width: 3.5px; border-radius: 1px"><div class=cover style="top: -3.5px; left: -3.5px; width: 25px; height: 25px;"></div></div></br>
+ <div class=outer style="border-width: 4px; border-radius: 2px"><div class=cover style="border-width: 3px; top: -4px; left: -4px; width: 22px; height: 22px;"></div></div></br>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167658 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/Source/WebCore/ChangeLog        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-04-22 Zalan Bujtas <zalan@apple.com>
+
+ border-style: double rendered as solid when combined with border-radius
+ https://bugs.webkit.org/show_bug.cgi?id=131927
+
+ Reviewed by Simon Fraser.
+
+ BorderEdge::getDoubleBorderStripeWidths() should return the calculated inner, outer border widths.
+
+ Test: fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html
+
+ * rendering/BorderEdge.cpp:
+ (WebCore::BorderEdge::getDoubleBorderStripeWidths):
+ * rendering/BorderEdge.h:
+
</ins><span class="cx"> 2014-04-22 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] don't ask for AVAssetTrack properties before they are available
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingBorderEdgecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/BorderEdge.cpp (167658 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/BorderEdge.cpp        2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/Source/WebCore/rendering/BorderEdge.cpp        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BorderEdge::getDoubleBorderStripeWidths(LayoutUnit outerWidth, LayoutUnit innerWidth) const
</del><ins>+void BorderEdge::getDoubleBorderStripeWidths(LayoutUnit& outerWidth, LayoutUnit& innerWidth) const
</ins><span class="cx"> {
</span><span class="cx"> LayoutUnit fullWidth = widthForPainting();
</span><span class="cx"> innerWidth = ceilToDevicePixel(fullWidth * 2 / 3, m_devicePixelRatio);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingBorderEdgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/BorderEdge.h (167658 => 167659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/BorderEdge.h        2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/Source/WebCore/rendering/BorderEdge.h        2014-04-22 14:17:43 UTC (rev 167659)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> inline bool shouldRender() const { return m_isPresent && widthForPainting() && hasVisibleColorAndStyle(); }
</span><span class="cx"> inline bool presentButInvisible() const { return widthForPainting() && !hasVisibleColorAndStyle(); }
</span><span class="cx"> inline float widthForPainting() const { return m_isPresent ? m_flooredToDevicePixelWidth : 0; }
</span><del>- void getDoubleBorderStripeWidths(LayoutUnit outerWidth, LayoutUnit innerWidth) const;
</del><ins>+ void getDoubleBorderStripeWidths(LayoutUnit& outerWidth, LayoutUnit& innerWidth) const;
</ins><span class="cx"> bool obscuresBackgroundEdge(float scale) const;
</span><span class="cx"> bool obscuresBackground() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>