<!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>[173108] branches/safari-600.1-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/173108">173108</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-28 20:56:17 -0700 (Thu, 28 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173097">r173097</a>. <rdar://problem/17927266></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsFonth">branches/safari-600.1-branch/Source/WebCore/platform/graphics/Font.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsfastcssmultipletabsexpectedhtml">branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs-expected.html</a></li>
<li><a href="#branchessafari6001branchLayoutTestsfastcssmultipletabshtml">branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (173107 => 173108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-29 03:48:58 UTC (rev 173107)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-29 03:56:17 UTC (rev 173108)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r173097
+
+ 2014-08-28 Enrica Casucci <enrica@apple.com>
+
+ Can't hit tab key more than 3 times continuously.
+ https://bugs.webkit.org/show_bug.cgi?id=136357
+ rdar://problem/17927266
+
+ Reviewed by Dean Jackson.
+
+ * fast/css/multiple-tabs-expected.html: Added.
+ * fast/css/multiple-tabs.html: Added.
+
</ins><span class="cx"> 2014-08-28 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip all fast/forms/color tests. <input type=color> is disabled on the
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfastcssmultipletabsexpectedhtmlfromrev173097trunkLayoutTestsfastcssmultipletabsexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs-expected.html (from rev 173097, trunk/LayoutTests/fast/css/multiple-tabs-expected.html) (0 => 173108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs-expected.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs-expected.html 2014-08-29 03:56:17 UTC (rev 173108)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<html>
+<head>
+<style>
+pre { margin: 0.1em; }
+</style>
+</head>
+<body>
+<b>Apple system font.</b>
+<div style="font: 12.000000px -apple-system-font;">
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+</div>
+<b>Noteworthy.</b>
+<div style="font: 18.000000px Noteworthy-Light;">
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+</div>
+<b>Helvetica.</b>
+<div style="font: 24.000000px Helvetica;">
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+<br>
+<span style="white-space: pre"> x</span>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfastcssmultipletabshtmlfromrev173097trunkLayoutTestsfastcssmultipletabshtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs.html (from rev 173097, trunk/LayoutTests/fast/css/multiple-tabs.html) (0 => 173108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/css/multiple-tabs.html 2014-08-29 03:56:17 UTC (rev 173108)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<html>
+<head>
+<style>
+ pre { margin: 0.1em; tab-size: 4; }
+</style>
+<script>
+
+function setupBlock(description, style)
+{
+ var descriptionBlock = document.createElement("b");
+ descriptionBlock.innerHTML = description;
+ document.body.appendChild(descriptionBlock);
+
+ var block = document.createElement("div");
+ if (style)
+ block.setAttribute("style", style);
+ block.innerHTML = document.getElementById("template").innerHTML;
+ document.body.appendChild(block);
+ return block;
+}
+
+function test()
+{
+ setupBlock("Apple system font.", "font: 12.000000px -apple-system-font;");
+ setupBlock("Noteworthy.", "font: 18.000000px Noteworthy-Light;");
+ setupBlock("Helvetica.", "font: 24.000000px Helvetica;");
+}
+</script>
+</head>
+<body onload="test();">
+<div id="template" style="display:none;">
+<span style="white-space: pre">&Tab;x</span>
+<br>
+<span style="white-space: pre">&Tab;&Tab;x</span>
+<br>
+<span style="white-space: pre">&Tab;&Tab;&Tab;x</span>
+<br>
+<span style="white-space: pre">&Tab;&Tab;&Tab;&Tab;x</span>
+<br>
+<span style="white-space: pre">&Tab;&Tab;&Tab;&Tab;&Tab;x</span>
+<br>
+<span style="white-space: pre">&Tab;&Tab;&Tab;&Tab;&Tab;&Tab;x</span>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173107 => 173108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-29 03:48:58 UTC (rev 173107)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-29 03:56:17 UTC (rev 173108)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-08-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173097
+
+ 2014-08-28 Enrica Casucci <enrica@apple.com>
+
+ Can't hit tab key more than 3 times continuously.
+ https://bugs.webkit.org/show_bug.cgi?id=136357
+ rdar://problem/17927266
+
+ Reviewed by Dean Jackson.
+
+ Test: fast/css/multiple-tabs.html
+
+ When computing the tabWidth disregard increments of less than half the size of the space character
+ for the given font.
+
+ * platform/graphics/Font.h:
+ (WebCore::Font::tabWidth):
+
+2014-08-28 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r173080
</span><span class="cx">
</span><span class="cx"> 2014-08-28 Pratik Solanki <psolanki@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/Font.h (173107 => 173108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/Font.h 2014-08-29 03:48:58 UTC (rev 173107)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/Font.h 2014-08-29 03:56:17 UTC (rev 173108)
</span><span class="lines">@@ -384,7 +384,8 @@
</span><span class="cx"> if (!tabSize)
</span><span class="cx"> return letterSpacing();
</span><span class="cx"> float tabWidth = tabSize * fontData.spaceWidth() + letterSpacing();
</span><del>- return tabWidth - fmodf(position, tabWidth);
</del><ins>+ float tabDeltaWidth = tabWidth - fmodf(position, tabWidth);
+ return (tabDeltaWidth < fontData.spaceWidth() / 2) ? tabWidth : tabDeltaWidth;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>