<!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>[177098] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177098">177098</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-10 14:10:23 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/164329">r164329</a>): Input fields are not honoring the maxlength attribute
https://bugs.webkit.org/show_bug.cgi?id=139447
Reviewed by Benjamin Poulain.
Source/WebCore:
The bug was caused by String::substring being called with the selection's end offset
in the second argument instead of the selection's length in handleBeforeTextInsertedEvent.
Fixed the bug by passing the right second argument to String::substring.
Test: fast/forms/input-maxlength-inserting-in-middle.html
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):
LayoutTests:
Added regression tests.
* fast/forms/input-maxlength-inserting-in-middle-expected.txt: Added.
* fast/forms/input-maxlength-inserting-in-middle.html: Added.
* fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt: Added.
* fast/forms/input-maxlength-paste-clusters-in-middle.html: Added.
* fast/forms/input-maxlength-paste-in-middle-expected.txt: Added.
* fast/forms/input-maxlength-paste-in-middle.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthinsertinginmiddleexpectedtxt">trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthinsertinginmiddlehtml">trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthpasteclustersinmiddleexpectedtxt">trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthpasteclustersinmiddlehtml">trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthpasteinmiddleexpectedtxt">trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsinputmaxlengthpasteinmiddlehtml">trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177097 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-10 21:51:20 UTC (rev 177097)
+++ trunk/LayoutTests/ChangeLog 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r164329): Input fields are not honoring the maxlength attribute
+ https://bugs.webkit.org/show_bug.cgi?id=139447
+
+ Reviewed by Benjamin Poulain.
+
+ Added regression tests.
+
+ * fast/forms/input-maxlength-inserting-in-middle-expected.txt: Added.
+ * fast/forms/input-maxlength-inserting-in-middle.html: Added.
+ * fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt: Added.
+ * fast/forms/input-maxlength-paste-clusters-in-middle.html: Added.
+ * fast/forms/input-maxlength-paste-in-middle-expected.txt: Added.
+ * fast/forms/input-maxlength-paste-in-middle.html: Added.
+
</ins><span class="cx"> 2014-12-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when creating CSSCalcBinaryOperation
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthinsertinginmiddleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle-expected.txt (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle-expected.txt 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This test attempts to insert a character in the middle of a text field with maxlength.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS input.value is "abc"
+PASS input.getAttribute("maxlength") is "3"
+PASS input.value is "abc"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthinsertinginmiddlehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle.html (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle.html (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-inserting-in-middle.html 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<input type="text" maxlength="3" value="abc">
+<script>
+
+description('This test attempts to insert a character in the middle of a text field with maxlength.');
+
+var input = document.querySelector('input');
+input.focus();
+input.selectionStart = 1;
+input.selectionEnd = 1;
+shouldBeEqualToString('input.value', 'abc');
+shouldBeEqualToString('input.getAttribute("maxlength")', '3');
+
+input.oninput = function () {
+ shouldBeEqualToString('input.value', 'abc');
+}
+
+if (window.eventSender)
+ eventSender.keyDown('1');
+else
+ debug('To test manually, type in "1" into the text field. It should fail.');
+
+var successfullyParsed = true;
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthpasteclustersinmiddleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle-expected.txt 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+This test attempts to paste text in the middle of a text field with maxlength.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS input.value is "abc"
+PASS input.getAttribute("maxlength") is "3"
+input.selectionStart = input.selectionEnd = 2
+getSelection().modify("extend", "backward", "character")
+PASS document.execCommand("insertText", false, "स्"); input.value is "aस्c"
+PASS input.value.length is 4
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthpasteclustersinmiddlehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle.html (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle.html (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-paste-clusters-in-middle.html 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<input type="text" maxlength="3" value="abc">
+<script>
+
+description('This test attempts to paste text in the middle of a text field with maxlength.');
+
+var input = document.querySelector('input');
+input.focus();
+input.selectionStart = 1;
+input.selectionEnd = 2;
+shouldBeEqualToString('input.value', 'abc');
+shouldBeEqualToString('input.getAttribute("maxlength")', '3');
+evalAndLog('input.selectionStart = input.selectionEnd = 2');
+evalAndLog('getSelection().modify("extend", "backward", "character")');
+shouldBeEqualToString('document.execCommand("insertText", false, "\u0938\u094D"); input.value', 'a\u0938\u094Dc');
+shouldBe('input.value.length', '4');
+
+var successfullyParsed = true;
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthpasteinmiddleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle-expected.txt (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle-expected.txt 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This test attempts to paste text in the middle of a text field with maxlength.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS input.value is "abc"
+PASS input.getAttribute("maxlength") is "3"
+input.selectionStart = 1
+input.selectionEnd = 2
+PASS document.execCommand("insertText", false, "123"); input.value is "a1c"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputmaxlengthpasteinmiddlehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle.html (0 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle.html (rev 0)
+++ trunk/LayoutTests/fast/forms/input-maxlength-paste-in-middle.html 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<input type="text" maxlength="3" value="abc">
+<script>
+
+description('This test attempts to paste text in the middle of a text field with maxlength.');
+
+var input = document.querySelector('input');
+input.focus();
+shouldBeEqualToString('input.value', 'abc');
+shouldBeEqualToString('input.getAttribute("maxlength")', '3');
+evalAndLog('input.selectionStart = 1');
+evalAndLog('input.selectionEnd = 2');
+shouldBeEqualToString('document.execCommand("insertText", false, "123"); input.value', 'a1c');
+
+var successfullyParsed = true;
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177097 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-10 21:51:20 UTC (rev 177097)
+++ trunk/Source/WebCore/ChangeLog 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r164329): Input fields are not honoring the maxlength attribute
+ https://bugs.webkit.org/show_bug.cgi?id=139447
+
+ Reviewed by Benjamin Poulain.
+
+ The bug was caused by String::substring being called with the selection's end offset
+ in the second argument instead of the selection's length in handleBeforeTextInsertedEvent.
+
+ Fixed the bug by passing the right second argument to String::substring.
+
+ Test: fast/forms/input-maxlength-inserting-in-middle.html
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):
+
</ins><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a missing null check.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (177097 => 177098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-12-10 21:51:20 UTC (rev 177097)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-12-10 22:10:23 UTC (rev 177098)
</span><span class="lines">@@ -384,7 +384,10 @@
</span><span class="cx"> unsigned selectionLength = 0;
</span><span class="cx"> if (element().focused()) {
</span><span class="cx"> ASSERT(enclosingTextFormControl(element().document().frame()->selection().selection().start()) == &element());
</span><del>- selectionLength = numGraphemeClusters(innerText.substring(element().selectionStart(), element().selectionEnd()));
</del><ins>+ int selectionStart = element().selectionStart();
+ ASSERT(selectionStart <= element().selectionEnd());
+ int selectionCodeUnitCount = element().selectionEnd() - selectionStart;
+ selectionLength = selectionCodeUnitCount ? numGraphemeClusters(innerText.substring(selectionStart, selectionCodeUnitCount)) : 0;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(oldLength >= selectionLength);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>