<!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>[178744] branches/safari-600.1.4.15-branch</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/178744">178744</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 12:52:05 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172797">r172797</a>. rdar://problem/19450115</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsTestExpectations">branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderObjectcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoublehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinggrooveatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinggrooveatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsethtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsethtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingridgeatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingridgeatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidatallexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidatallhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintinggrooveexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintinggroovehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintingridgeexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintingridgehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (178743 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-20 20:46:16 UTC (rev 178743)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -1,5 +1,54 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172797.
+
+ 2014-08-20 Zalan Bujtas <zalan@apple.com>
+
+ Dashed/dotted borders do not paint.
+ https://bugs.webkit.org/show_bug.cgi?id=135898
+
+ Reviewed by Simon Fraser.
+
+ *-at-all files test that we always paint borders.
+ The other set of files test that borders are painted properly. They take
+ advantage of the fact that borders with radius use a different painting code path.
+
+ * TestExpectations:
+ * fast/borders/border-painting-dashed-at-all-expected.html: Added.
+ * fast/borders/border-painting-dashed-at-all.html: Added.
+ * fast/borders/border-painting-dashed-expected.html: Added.
+ * fast/borders/border-painting-dashed.html: Added.
+ * fast/borders/border-painting-dotted-at-all-expected.html: Added.
+ * fast/borders/border-painting-dotted-at-all.html: Added.
+ * fast/borders/border-painting-dotted-expected.html: Added.
+ * fast/borders/border-painting-dotted.html: Added.
+ * fast/borders/border-painting-double-at-all-expected.html: Added.
+ * fast/borders/border-painting-double-at-all.html: Added.
+ * fast/borders/border-painting-double-expected.html: Added.
+ * fast/borders/border-painting-double.html: Added.
+ * fast/borders/border-painting-groove-at-all-expected.html: Added.
+ * fast/borders/border-painting-groove-at-all.html: Added.
+ * fast/borders/border-painting-inset-at-all-expected.html: Added.
+ * fast/borders/border-painting-inset-at-all.html: Added.
+ * fast/borders/border-painting-inset-expected.html: Added.
+ * fast/borders/border-painting-inset.html: Added.
+ * fast/borders/border-painting-outset-at-all-expected.html: Added.
+ * fast/borders/border-painting-outset-at-all.html: Added.
+ * fast/borders/border-painting-outset-expected.html: Added.
+ * fast/borders/border-painting-outset.html: Added.
+ * fast/borders/border-painting-ridge-at-all-expected.html: Added.
+ * fast/borders/border-painting-ridge-at-all.html: Added.
+ * fast/borders/border-painting-solid-at-all-expected.html: Added.
+ * fast/borders/border-painting-solid-at-all.html: Added.
+ * fast/borders/border-painting-solid-expected.html: Added.
+ * fast/borders/border-painting-solid.html: Added.
+ * fast/borders/hidpi-border-painting-groove-expected.html: Added.
+ * fast/borders/hidpi-border-painting-groove.html: Added.
+ * fast/borders/hidpi-border-painting-ridge-expected.html: Added.
+ * fast/borders/hidpi-border-painting-ridge.html: Added.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172504.
</span><span class="cx">
</span><span class="cx"> 2014-08-12 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations (178743 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations 2015-01-20 20:46:16 UTC (rev 178743)
+++ branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -129,3 +129,8 @@
</span><span class="cx">
</span><span class="cx"> # Failing on some bots due to using resource load callbacks
</span><span class="cx"> webkit.org/b/134769 fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html [ Skip ]
</span><ins>+
+# border painting diff (Path vs. drawLine)
+webkit.org/b/136078 fast/borders/border-painting-dashed.html [ ImageOnlyFailure ]
+webkit.org/b/136078 fast/borders/border-painting-dotted.html [ ImageOnlyFailure ]
+webkit.org/b/136078 fast/borders/border-painting-double.html [ ImageOnlyFailure ]
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdashedatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dashed-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ width: 1px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.height = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ w = 10 * i;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdashedatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dashed-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: dashed red;
+ }
+
+ .hide {
+ position: fixed;
+ top: 0px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hideBox = document.createElement("div");
+ hideBox.className = "hide";
+ hideBox.style.left = x + 1 + "px";
+ hideBox.style.width = w - 1 + "px";
+ hideBox.style.height = borderWidth + "px";
+ document.body.appendChild(hideBox);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdashedexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dashed-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: dashed;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdashedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdashedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dashed.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dashed.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: dashed;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdottedatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dotted-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dotted borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ width: 1px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.height = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ w = 10 * i;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdottedatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dotted-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: dotted red;
+ }
+
+ .hide {
+ position: fixed;
+ top: 0px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hideBox = document.createElement("div");
+ hideBox.className = "hide";
+ hideBox.style.left = x + 1 + "px";
+ hideBox.style.width = w - 1 + "px";
+ hideBox.style.height = borderWidth + "px";
+ document.body.appendChild(hideBox);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdottedexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dotted-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dotted borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: dotted;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdottedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdottedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-dotted.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-dotted.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dotted borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: dotted;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdoubleatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-double-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that double borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ height: 1px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdoubleatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-double-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: double red;
+ }
+
+ .hide {
+ position: fixed;
+ top: 0px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hideBox = document.createElement("div");
+ hideBox.className = "hide";
+ hideBox.style.top = "1px";
+ hideBox.style.left = x + "px";
+ hideBox.style.width = w + "px";
+ hideBox.style.height = borderWidth + "px";
+ document.body.appendChild(hideBox);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoubleexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdoubleexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-double-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that double borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: double;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 3;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingdoublehtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingdoublehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-double.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-double.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that double borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: double;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 3;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinggrooveatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinggrooveatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-groove-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that groove borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.top = borderWidth / 2 + "px";
+ e.style.left = x + "px";
+ e.style.height = borderWidth / 2 + "px";
+ e.style.width = w + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinggrooveatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinggrooveatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-groove-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-groove-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: groove red;
+ }
+
+ .hide {
+ position: fixed;
+ top: 0px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hideBox = document.createElement("div");
+ hideBox.className = "hide";
+ hideBox.style.left = x + "px";
+ hideBox.style.width = w + "px";
+ hideBox.style.height = borderWidth / 2 + "px";
+ document.body.appendChild(hideBox);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinginsetatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-inset-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that inset borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 10px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinginsetatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-inset-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-bottom: inset red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderBottomWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsetexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinginsetexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-inset-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that inset borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: inset;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintinginsethtmlfromrev172797trunkLayoutTestsfastbordersborderpaintinginsethtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-inset.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-inset.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that inset borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: inset;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingoutsetatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-outset-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ width: 1px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingoutsetatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-outset-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: outset red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsetexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingoutsetexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-outset-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that outset borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: outset;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ var e = document.createElement("div");
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingoutsethtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingoutsethtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-outset.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-outset.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that outset borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: outset;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ var e = document.createElement("div");
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingridgeatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingridgeatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-ridge-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = borderWidth / 2 + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingridgeatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingridgeatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-ridge-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-ridge-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: ridge red;
+ }
+
+ .hide {
+ position: fixed;
+ top: 0px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hideBox = document.createElement("div");
+ hideBox.className = "hide";
+ hideBox.style.top = borderWidth / 2 + "px";
+ hideBox.style.left = x + "px";
+ hideBox.style.width = w + "px";
+ hideBox.style.height = borderWidth / 2 + "px";
+ document.body.appendChild(hideBox);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidatallexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingsolidatallexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-solid-at-all-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ div {
+ position: absolute;
+ top: 0px;
+ background-color: red;
+ }
+
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidatallhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingsolidatallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-solid-at-all.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-at-all.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that dashed borders are painted at all.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ top: 0px;
+ height: 10px;
+ border-top: solid red;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ for (var i = 1; i < 10; ++i) {
+ w = 10 * i;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.borderTopWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidexpectedhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingsolidexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-solid-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that solid borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: solid;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordersborderpaintingsolidhtmlfromrev172797trunkLayoutTestsfastbordersborderpaintingsolidhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid.html (from rev 172797, trunk/LayoutTests/fast/borders/border-painting-solid.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/border-painting-solid.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that solid borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: solid;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintinggrooveexpectedhtmlfromrev172797trunkLayoutTestsfastbordershidpiborderpaintinggrooveexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/hidpi-border-painting-groove-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that groove borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: groove;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintinggroovehtmlfromrev172797trunkLayoutTestsfastbordershidpiborderpaintinggroovehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove.html (from rev 172797, trunk/LayoutTests/fast/borders/hidpi-border-painting-groove.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-groove.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that groove borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: groove;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintingridgeexpectedhtmlfromrev172797trunkLayoutTestsfastbordershidpiborderpaintingridgeexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge-expected.html (from rev 172797, trunk/LayoutTests/fast/borders/hidpi-border-painting-ridge-expected.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge-expected.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that ridge borders are painted. It takes advantage of the fact that borders with radius get through a different code path (Path vs. drawLine).</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: ridge;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.style.borderRadius = borderWidth + 1 + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbordershidpiborderpaintingridgehtmlfromrev172797trunkLayoutTestsfastbordershidpiborderpaintingridgehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge.html (from rev 172797, trunk/LayoutTests/fast/borders/hidpi-border-painting-ridge.html) (0 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/borders/hidpi-border-painting-ridge.html 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that ridge borders are painted.</title>
+<style>
+ .borderBox {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ border-style: ridge;
+ border-color: red;
+ }
+
+ .hide {
+ position: fixed;
+ width: 4px;
+ height: 4px;
+ background-color: white;
+ }
+</style>
+<head>
+<body>
+<script>
+ var borderWidth = 1;
+ var x = 0;
+ var y = 0;
+ var cornerBoxSize = 0;
+ for (var i = 0; i < 10; ++i) {
+ w = 20 * i;
+ h = 20 * i;
+ cornerBoxSize = 2 * borderWidth;
+
+ var e = document.createElement("div");
+ e.className = "borderBox";
+ e.style.top = y + "px";
+ e.style.left = x + "px";
+ e.style.width = w + "px";
+ e.style.height = h + "px";
+ e.style.borderWidth = borderWidth + "px";
+ document.body.appendChild(e);
+
+ var hb1 = document.createElement("div");
+ hb1.className = "hide";
+ hb1.style.top = y + "px";
+ hb1.style.left = x + "px";
+ hb1.style.width = cornerBoxSize + "px";
+ hb1.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb1);
+
+ var hb2 = document.createElement("div");
+ hb2.className = "hide";
+ hb2.style.top = y + "px";
+ hb2.style.left = x + w + "px";
+ hb2.style.width = cornerBoxSize + "px";
+ hb2.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb2);
+
+ var hb3 = document.createElement("div");
+ hb3.className = "hide";
+ hb3.style.top = y + h + "px";
+ hb3.style.left = x + "px";
+ hb3.style.width = cornerBoxSize + "px";
+ hb3.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb3);
+
+ var hb4 = document.createElement("div");
+ hb4.className = "hide";
+ hb4.style.top = y + w + "px";
+ hb4.style.left = x + h + "px";
+ hb4.style.width = cornerBoxSize + "px";
+ hb4.style.height = cornerBoxSize + "px";
+ document.body.appendChild(hb4);
+
+ borderWidth += 1;
+ x += (w + 2 * borderWidth);
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178743 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:46:16 UTC (rev 178743)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172797.
+
+ 2014-08-20 Zalan Bujtas <zalan@apple.com>
+
+ Dashed/dotted borders do not paint.
+ https://bugs.webkit.org/show_bug.cgi?id=135898
+
+ Reviewed by Simon Fraser.
+
+ Remove the empty line checks for drawLines. There's no need to protect the graphics
+ context from empty lines.
+
+ Tests: fast/borders/border-painting-dashed-at-all.html
+ fast/borders/border-painting-dashed.html
+ fast/borders/border-painting-dotted-at-all.html
+ fast/borders/border-painting-dotted.html
+ fast/borders/border-painting-double-at-all.html
+ fast/borders/border-painting-double.html
+ fast/borders/border-painting-groove-at-all.html
+ fast/borders/border-painting-inset-at-all.html
+ fast/borders/border-painting-inset.html
+ fast/borders/border-painting-outset-at-all.html
+ fast/borders/border-painting-outset.html
+ fast/borders/border-painting-ridge-at-all.html
+ fast/borders/border-painting-solid-at-all.html
+ fast/borders/border-painting-solid.html
+ fast/borders/hidpi-border-painting-groove.html
+ fast/borders/hidpi-border-painting-ridge.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+ (WebCore::drawBorderLineRect): Deleted.
+ (WebCore::drawBorderLine): Deleted.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172504.
</span><span class="cx">
</span><span class="cx"> 2014-08-12 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderObject.cpp (178743 => 178744)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderObject.cpp 2015-01-20 20:46:16 UTC (rev 178743)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderObject.cpp 2015-01-20 20:52:05 UTC (rev 178744)
</span><span class="lines">@@ -737,23 +737,6 @@
</span><span class="cx"> return toRenderBlock(o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void drawBorderLineRect(GraphicsContext& graphicsContext, const LayoutRect& rect, float deviceScaleFactor)
-{
- FloatRect pixelSnappedRect = pixelSnappedForPainting(rect, deviceScaleFactor);
- if (pixelSnappedRect.isEmpty())
- return;
- graphicsContext.drawRect(pixelSnappedRect);
-}
-
-static void drawBorderLine(GraphicsContext& graphicsContext, const LayoutPoint& point1, const LayoutPoint& point2, float deviceScaleFactor)
-{
- FloatPoint p1 = roundedForPainting(point1, deviceScaleFactor);
- FloatPoint p2 = roundedForPainting(point2, deviceScaleFactor);
- if (p1.x() == p2.x() || p1.y() == p2.y())
- return;
- graphicsContext.drawLine(point1, point2);
-}
-
</del><span class="cx"> void RenderObject::drawLineForBoxSide(GraphicsContext* graphicsContext, float x1, float y1, float x2, float y2,
</span><span class="cx"> BoxSide side, Color color, EBorderStyle borderStyle, float adjacentWidth1, float adjacentWidth2, bool antialias) const
</span><span class="cx"> {
</span><span class="lines">@@ -797,11 +780,11 @@
</span><span class="cx"> switch (side) {
</span><span class="cx"> case BSBottom:
</span><span class="cx"> case BSTop:
</span><del>- drawBorderLine(*graphicsContext, LayoutPoint(x1, adjustedY), LayoutPoint(x2, adjustedY), deviceScaleFactor);
</del><ins>+ graphicsContext->drawLine(FloatPoint(x1, adjustedY), FloatPoint(x2, adjustedY));
</ins><span class="cx"> break;
</span><span class="cx"> case BSRight:
</span><span class="cx"> case BSLeft:
</span><del>- drawBorderLine(*graphicsContext, LayoutPoint(adjustedX, y1), LayoutPoint(adjustedX, y2), deviceScaleFactor);
</del><ins>+ graphicsContext->drawLine(FloatPoint(adjustedX, y1), FloatPoint(adjustedX, y2));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> graphicsContext->setShouldAntialias(wasAntialiased);
</span><span class="lines">@@ -824,13 +807,13 @@
</span><span class="cx"> switch (side) {
</span><span class="cx"> case BSTop:
</span><span class="cx"> case BSBottom:
</span><del>- drawBorderLineRect(*graphicsContext, LayoutRect(x1, y1, length, thirdOfThickness), deviceScaleFactor);
- drawBorderLineRect(*graphicsContext, LayoutRect(x1, y2 - thirdOfThickness, length, thirdOfThickness), deviceScaleFactor);
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(x1, y1, length, thirdOfThickness, deviceScaleFactor));
+ graphicsContext->drawRect(pixelSnappedForPainting(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>- drawBorderLineRect(*graphicsContext, LayoutRect(x1, y1, thirdOfThickness, length), deviceScaleFactor);
- drawBorderLineRect(*graphicsContext, LayoutRect(x2 - thirdOfThickness, y1, thirdOfThickness, length), deviceScaleFactor);
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(x1, y1, thirdOfThickness, length, deviceScaleFactor));
+ graphicsContext->drawRect(pixelSnappedForPainting(x2 - thirdOfThickness, y1, thirdOfThickness, length, deviceScaleFactor));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -976,7 +959,7 @@
</span><span class="cx"> graphicsContext->setFillColor(color, style.colorSpace());
</span><span class="cx"> bool wasAntialiased = graphicsContext->shouldAntialias();
</span><span class="cx"> graphicsContext->setShouldAntialias(antialias);
</span><del>- drawBorderLineRect(*graphicsContext, LayoutRect(x1, y1, x2 - x1, y2 - y1), deviceScaleFactor);
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(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 class="lines">@@ -987,8 +970,7 @@
</span><span class="cx"> y1 = roundToDevicePixel(y1, deviceScaleFactor);
</span><span class="cx"> x2 = roundToDevicePixel(x2, deviceScaleFactor);
</span><span class="cx"> y2 = roundToDevicePixel(y2, deviceScaleFactor);
</span><del>- if (x1 == x2 || y1 == y2)
- return;
</del><ins>+
</ins><span class="cx"> FloatPoint quad[4];
</span><span class="cx"> switch (side) {
</span><span class="cx"> case BSTop:
</span></span></pre>
</div>
</div>
</body>
</html>