<!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>[164194] 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/164194">164194</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-16 14:00:21 -0800 (Sun, 16 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>setSelectionRange shouldn't directly instantiate VisibleSelection
https://bugs.webkit.org/show_bug.cgi?id=128881
Reviewed by Andreas Kling.
Added a new version of moveTo for setSelectionRange.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::moveTo): Added.
* editing/FrameSelection.h:
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::setSelectionRange): Use the newly added FrameSelection::moveTo
instead of manually instantiating VisibleSelection here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</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 (164193 => 164194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-16 21:38:16 UTC (rev 164193)
+++ trunk/Source/WebCore/ChangeLog 2014-02-16 22:00:21 UTC (rev 164194)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-16 Ryosuke Niwa <rniwa@webkit.org>
+
+ setSelectionRange shouldn't directly instantiate VisibleSelection
+ https://bugs.webkit.org/show_bug.cgi?id=128881
+
+ Reviewed by Andreas Kling.
+
+ Added a new version of moveTo for setSelectionRange.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::moveTo): Added.
+ * editing/FrameSelection.h:
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::setSelectionRange): Use the newly added FrameSelection::moveTo
+ instead of manually instantiating VisibleSelection here.
+
</ins><span class="cx"> 2014-02-16 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (164193 => 164194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-16 21:38:16 UTC (rev 164193)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-16 22:00:21 UTC (rev 164194)
</span><span class="lines">@@ -164,6 +164,12 @@
</span><span class="cx"> setSelection(VisibleSelection(base, extent, affinity, selectionHasDirection), defaultSetSelectionOptions(userTriggered));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameSelection::moveTo(const Position& base, const Position& extent, bool selectionHasDirection, bool shouldSetFocus)
+{
+ setSelection(VisibleSelection(base, extent, DOWNSTREAM, selectionHasDirection),
+ defaultSetSelectionOptions() | (shouldSetFocus ? 0 : DoNotSetFocus));
+}
+
</ins><span class="cx"> void DragCaretController::setCaretPosition(const VisiblePosition& position)
</span><span class="cx"> {
</span><span class="cx"> if (Node* node = m_position.deepEquivalent().deprecatedNode())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (164193 => 164194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-02-16 21:38:16 UTC (rev 164193)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-02-16 22:00:21 UTC (rev 164194)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> void moveTo(const VisiblePosition&, const VisiblePosition&, EUserTriggered = NotUserTriggered);
</span><span class="cx"> void moveTo(const Position&, EAffinity, EUserTriggered = NotUserTriggered);
</span><span class="cx"> void moveTo(const Position&, const Position&, EAffinity, EUserTriggered = NotUserTriggered);
</span><ins>+ void moveTo(const Position&, const Position&, bool selectionHasDirection, bool shouldSetFocus);
</ins><span class="cx">
</span><span class="cx"> const VisibleSelection& selection() const { return m_selection; }
</span><span class="cx"> void setSelection(const VisibleSelection&, SetSelectionOptions = defaultSetSelectionOptions(), CursorAlignOnScroll = AlignCursorOnScrollIfNeeded, TextGranularity = CharacterGranularity);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (164193 => 164194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-16 21:38:16 UTC (rev 164193)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-16 22:00:21 UTC (rev 164194)
</span><span class="lines">@@ -306,21 +306,16 @@
</span><span class="cx"> Position endPosition;
</span><span class="cx"> if (start == end)
</span><span class="cx"> endPosition = startPosition;
</span><del>- else
- endPosition = positionForIndex(innerText, end);
</del><ins>+ else {
+ if (direction == SelectionHasBackwardDirection) {
+ endPosition = startPosition;
+ startPosition = positionForIndex(innerText, end);
+ } else
+ endPosition = positionForIndex(innerText, end);
+ }
</ins><span class="cx">
</span><del>- VisibleSelection newSelection;
- if (direction == SelectionHasBackwardDirection)
- newSelection = VisibleSelection(endPosition, startPosition);
- else
- newSelection = VisibleSelection(startPosition, endPosition);
- newSelection.setIsDirectional(direction != SelectionHasNoDirection);
-
- FrameSelection::SetSelectionOptions options = FrameSelection::defaultSetSelectionOptions();
- if (hasFocus)
- options |= FrameSelection::DoNotSetFocus;
</del><span class="cx"> if (Frame* frame = document().frame())
</span><del>- frame->selection().setSelection(newSelection, options);
</del><ins>+ frame->selection().moveTo(startPosition, endPosition, direction != SelectionHasNoDirection, !hasFocus);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLTextFormControlElement::indexForVisiblePosition(const VisiblePosition& position) const
</span></span></pre>
</div>
</div>
</body>
</html>