<!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>[164329] trunk/Source/WebCore</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/164329">164329</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-18 16:04:07 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TextFieldInputType::handleBeforeTextInsertedEvent shouldn't use plainText
https://bugs.webkit.org/show_bug.cgi?id=128953
Reviewed by Alexey Proskuryakov.
Don't use FrameSelection's toNormalizedRange and plainText. Instead, use the cached selection start and selection
end to extract the selected text. The caches are updated inside FrameSelection::setSelection whenever selection
is inside a text form control via HTMLTextFormControlElement::selectionChanged.
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164328 => 164329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-18 23:26:32 UTC (rev 164328)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 00:04:07 UTC (rev 164329)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ TextFieldInputType::handleBeforeTextInsertedEvent shouldn't use plainText
+ https://bugs.webkit.org/show_bug.cgi?id=128953
+
+ Reviewed by Alexey Proskuryakov.
+
+ Don't use FrameSelection's toNormalizedRange and plainText. Instead, use the cached selection start and selection
+ end to extract the selected text. The caches are updated inside FrameSelection::setSelection whenever selection
+ is inside a text form control via HTMLTextFormControlElement::selectionChanged.
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):
+
</ins><span class="cx"> 2014-02-18 Viatcheslav Ostapenko <sl.ostapenko@samsung.com>
</span><span class="cx">
</span><span class="cx"> Bottom/right sticky positioning don't correctly handle scroll containers with padding
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (164328 => 164329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-02-18 23:26:32 UTC (rev 164328)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-02-19 00:04:07 UTC (rev 164329)
</span><span class="lines">@@ -374,14 +374,19 @@
</span><span class="cx"> // We use RenderTextControlSingleLine::text() instead of InputElement::value()
</span><span class="cx"> // because they can be mismatched by sanitizeValue() in
</span><span class="cx"> // HTMLInputElement::subtreeHasChanged() in some cases.
</span><del>- unsigned oldLength = numGraphemeClusters(element().innerTextValue());
</del><ins>+ String innerText = element().innerTextValue();
+ unsigned oldLength = numGraphemeClusters(innerText);
</ins><span class="cx">
</span><span class="cx"> // selectionLength represents the selection length of this text field to be
</span><span class="cx"> // removed by this insertion.
</span><span class="cx"> // If the text field has no focus, we don't need to take account of the
</span><span class="cx"> // selection length. The selection is the source of text drag-and-drop in
</span><span class="cx"> // that case, and nothing in the text field will be removed.
</span><del>- unsigned selectionLength = element().focused() ? numGraphemeClusters(plainText(element().document().frame()->selection().selection().toNormalizedRange().get())) : 0;
</del><ins>+ unsigned selectionLength = 0;
+ if (element().focused()) {
+ ASSERT(enclosingTextFormControl(element().document().frame()->selection().selection().start()) == &element());
+ selectionLength = numGraphemeClusters(innerText.substring(element().selectionStart(), element().selectionEnd()));
+ }
</ins><span class="cx"> ASSERT(oldLength >= selectionLength);
</span><span class="cx">
</span><span class="cx"> // Selected characters will be removed by the next text event.
</span></span></pre>
</div>
</div>
</body>
</html>