<!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>[163825] 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/163825">163825</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-10 15:05:19 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLTextFormControlElement::setSelectionRange shouldn't use VisiblePosition
https://bugs.webkit.org/show_bug.cgi?id=128478
Reviewed by Darin Adler.
Added positionForIndex to compute Position given a selection index. This function doesn't
synchronously trigger like visiblePositionForIndex.
Also added assertions in visiblePositionForIndex and visiblePositionForIndex to make sure
they are inverse of one another.
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::setSelectionRange): Use positionForIndex. Also removed
the now tautological assertions since we would never create a position outside the inner text
element.
(WebCore::HTMLTextFormControlElement::indexForVisiblePosition): Fixed the bug where this
function could return a selection index beyond innerTextElement in some types of input
elements such as search fields. fast/forms/search-disabled-readonly.html hits the newly
added assertion without this change. Note we can't use visiblePositionForIndex here as that
would result in a mutual recursion with the assertion in visiblePositionForIndex.
(WebCore::HTMLTextFormControlElement::visiblePositionForIndex): Added an assertion.
(WebCore::positionForIndex): Added. It's here with prototype at the beginning of the file
so that it's right next to HTMLTextFormControlElement::innerText() where we do a similar
DOM traversal to obtain the inner text value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163824 => 163825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-10 22:58:29 UTC (rev 163824)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 23:05:19 UTC (rev 163825)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ HTMLTextFormControlElement::setSelectionRange shouldn't use VisiblePosition
+ https://bugs.webkit.org/show_bug.cgi?id=128478
+
+ Reviewed by Darin Adler.
+
+ Added positionForIndex to compute Position given a selection index. This function doesn't
+ synchronously trigger like visiblePositionForIndex.
+
+ Also added assertions in visiblePositionForIndex and visiblePositionForIndex to make sure
+ they are inverse of one another.
+
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::setSelectionRange): Use positionForIndex. Also removed
+ the now tautological assertions since we would never create a position outside the inner text
+ element.
+
+ (WebCore::HTMLTextFormControlElement::indexForVisiblePosition): Fixed the bug where this
+ function could return a selection index beyond innerTextElement in some types of input
+ elements such as search fields. fast/forms/search-disabled-readonly.html hits the newly
+ added assertion without this change. Note we can't use visiblePositionForIndex here as that
+ would result in a mutual recursion with the assertion in visiblePositionForIndex.
+
+ (WebCore::HTMLTextFormControlElement::visiblePositionForIndex): Added an assertion.
+
+ (WebCore::positionForIndex): Added. It's here with prototype at the beginning of the file
+ so that it's right next to HTMLTextFormControlElement::innerText() where we do a similar
+ DOM traversal to obtain the inner text value.
+
</ins><span class="cx"> 2014-02-07 Jeffrey Pfau <jpfau@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable access to application cache when in private browsing
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (163824 => 163825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-10 22:58:29 UTC (rev 163824)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-10 23:05:19 UTC (rev 163825)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><ins>+static Position positionForIndex(TextControlInnerTextElement*, unsigned);
+
</ins><span class="cx"> HTMLTextFormControlElement::HTMLTextFormControlElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
</span><span class="cx"> : HTMLFormControlElementWithState(tagName, document, form)
</span><span class="cx"> , m_lastChangeWasUserEdit(false)
</span><span class="lines">@@ -296,25 +298,18 @@
</span><span class="cx"> end = std::max(end, 0);
</span><span class="cx"> start = std::min(std::max(start, 0), end);
</span><span class="cx">
</span><del>- if (!hasVisibleTextArea(*renderer(), innerTextElement())) {
</del><ins>+ TextControlInnerTextElement* innerText = innerTextElement();
+ if (!hasVisibleTextArea(*renderer(), innerText)) {
</ins><span class="cx"> cacheSelection(start, end, direction);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- VisiblePosition startPosition = visiblePositionForIndex(start);
- VisiblePosition endPosition;
</del><ins>+ Position startPosition = positionForIndex(innerText, start);
+ Position endPosition;
</ins><span class="cx"> if (start == end)
</span><span class="cx"> endPosition = startPosition;
</span><span class="cx"> else
</span><del>- endPosition = visiblePositionForIndex(end);
</del><ins>+ endPosition = positionForIndex(innerText, end);
</ins><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- // startPosition and endPosition can be null position for example when
- // "-webkit-user-select: none" style attribute is specified.
- if (startPosition.isNotNull() && endPosition.isNotNull()) {
- ASSERT(startPosition.deepEquivalent().deprecatedNode()->shadowHost() == this
- && endPosition.deepEquivalent().deprecatedNode()->shadowHost() == this);
- }
-#endif
</del><span class="cx"> VisibleSelection newSelection;
</span><span class="cx"> if (direction == SelectionHasBackwardDirection)
</span><span class="cx"> newSelection = VisibleSelection(endPosition, startPosition);
</span><span class="lines">@@ -328,15 +323,20 @@
</span><span class="cx">
</span><span class="cx"> int HTMLTextFormControlElement::indexForVisiblePosition(const VisiblePosition& pos) const
</span><span class="cx"> {
</span><del>- if (enclosingTextFormControl(pos.deepEquivalent()) != this)
</del><ins>+ TextControlInnerTextElement* innerText = innerTextElement();
+ if (!innerText || !innerText->contains(pos.deepEquivalent().anchorNode()))
</ins><span class="cx"> return 0;
</span><span class="cx"> bool forSelectionPreservation = false;
</span><del>- return WebCore::indexForVisiblePosition(innerTextElement(), pos, forSelectionPreservation);
</del><ins>+ unsigned index = WebCore::indexForVisiblePosition(innerTextElement(), pos, forSelectionPreservation);
+ ASSERT(VisiblePosition(positionForIndex(innerTextElement(), index)) == pos);
+ return index;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisiblePosition HTMLTextFormControlElement::visiblePositionForIndex(int index) const
</span><span class="cx"> {
</span><del>- return visiblePositionForIndexUsingCharacterIterator(innerTextElement(), index);
</del><ins>+ VisiblePosition position = positionForIndex(innerTextElement(), index);
+ ASSERT(indexForVisiblePosition(position) == index);
+ return position;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLTextFormControlElement::selectionStart() const
</span><span class="lines">@@ -557,6 +557,24 @@
</span><span class="cx"> return finishText(result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Position positionForIndex(TextControlInnerTextElement* innerText, unsigned index)
+{
+ unsigned remainingCharactersToMoveForward = index;
+ for (Node* node = innerText; node; node = NodeTraversal::next(node, innerText)) {
+ if (node->hasTagName(brTag)) {
+ if (!remainingCharactersToMoveForward)
+ return positionBeforeNode(node);
+ remainingCharactersToMoveForward--;
+ } else if (node->isTextNode()) {
+ Text* text = toText(node);
+ if (remainingCharactersToMoveForward < text->length())
+ return Position(text, remainingCharactersToMoveForward);
+ remainingCharactersToMoveForward -= text->length();
+ }
+ }
+ return lastPositionInNode(innerText);
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void HTMLTextFormControlElement::hidePlaceholder()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>