<!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>[164188] 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/164188">164188</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 19:33:57 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DOMSelection shouldn't instantiate VisibleSelection everywhere
https://bugs.webkit.org/show_bug.cgi?id=128879
Reviewed by Antti Koivisto.
Removed explicit instantiation of VisibleSelection from various member functions of VisibleSelection.
* page/DOMSelection.cpp:
(WebCore::DOMSelection::collapse):
(WebCore::DOMSelection::collapseToEnd):
(WebCore::DOMSelection::collapseToStart):
(WebCore::DOMSelection::setBaseAndExtent):
(WebCore::DOMSelection::setPosition):
(WebCore::DOMSelection::extend):
(WebCore::DOMSelection::getRangeAt):
(WebCore::DOMSelection::addRange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMSelectioncpp">trunk/Source/WebCore/page/DOMSelection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164187 => 164188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-16 03:11:47 UTC (rev 164187)
+++ trunk/Source/WebCore/ChangeLog 2014-02-16 03:33:57 UTC (rev 164188)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-02-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ DOMSelection shouldn't instantiate VisibleSelection everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=128879
+
+ Reviewed by Antti Koivisto.
+
+ Removed explicit instantiation of VisibleSelection from various member functions of VisibleSelection.
+
+ * page/DOMSelection.cpp:
+ (WebCore::DOMSelection::collapse):
+ (WebCore::DOMSelection::collapseToEnd):
+ (WebCore::DOMSelection::collapseToStart):
+ (WebCore::DOMSelection::setBaseAndExtent):
+ (WebCore::DOMSelection::setPosition):
+ (WebCore::DOMSelection::extend):
+ (WebCore::DOMSelection::getRangeAt):
+ (WebCore::DOMSelection::addRange):
+
+2014-02-15 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Remove unused arguments from moveTo(Range*)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128878
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMSelection.cpp (164187 => 164188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMSelection.cpp 2014-02-16 03:11:47 UTC (rev 164187)
+++ trunk/Source/WebCore/page/DOMSelection.cpp 2014-02-16 03:33:57 UTC (rev 164188)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Eliminate legacy editing positions
</span><del>- m_frame->selection().moveTo(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
</del><ins>+ m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::collapseToEnd(ExceptionCode& ec)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_frame->selection().moveTo(VisiblePosition(selection.end(), DOWNSTREAM));
</del><ins>+ m_frame->selection().moveTo(selection.end(), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::collapseToStart(ExceptionCode& ec)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_frame->selection().moveTo(VisiblePosition(selection.start(), DOWNSTREAM));
</del><ins>+ m_frame->selection().moveTo(selection.start(), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::empty()
</span><span class="lines">@@ -258,10 +258,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Eliminate legacy editing positions
</span><del>- VisiblePosition visibleBase = VisiblePosition(createLegacyEditingPosition(baseNode, baseOffset), DOWNSTREAM);
- VisiblePosition visibleExtent = VisiblePosition(createLegacyEditingPosition(extentNode, extentOffset), DOWNSTREAM);
-
- m_frame->selection().moveTo(visibleBase, visibleExtent);
</del><ins>+ m_frame->selection().moveTo(createLegacyEditingPosition(baseNode, baseOffset), createLegacyEditingPosition(extentNode, extentOffset), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::setPosition(Node* node, int offset, ExceptionCode& ec)
</span><span class="lines">@@ -277,7 +274,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Eliminate legacy editing positions
</span><del>- m_frame->selection().moveTo(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
</del><ins>+ m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::modify(const String& alterString, const String& directionString, const String& granularityString)
</span><span class="lines">@@ -349,7 +346,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Eliminate legacy editing positions
</span><del>- m_frame->selection().setExtent(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
</del><ins>+ m_frame->selection().setExtent(createLegacyEditingPosition(node, offset), DOWNSTREAM);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> DOMSelection::getRangeAt(int index, ExceptionCode& ec)
</span><span class="lines">@@ -371,8 +368,7 @@
</span><span class="cx"> return Range::create(shadowAncestor->document(), container, offset, container, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const VisibleSelection& selection = m_frame->selection().selection();
- return selection.firstRange();
</del><ins>+ return m_frame->selection().selection().firstRange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMSelection::removeAllRanges()
</span><span class="lines">@@ -392,7 +388,7 @@
</span><span class="cx"> FrameSelection& selection = m_frame->selection();
</span><span class="cx">
</span><span class="cx"> if (selection.isNone()) {
</span><del>- selection.setSelection(VisibleSelection(r));
</del><ins>+ selection.moveTo(r);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -400,23 +396,25 @@
</span><span class="cx"> if (r->compareBoundaryPoints(Range::START_TO_START, range.get(), IGNORE_EXCEPTION) == -1) {
</span><span class="cx"> // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
</span><span class="cx"> if (r->compareBoundaryPoints(Range::START_TO_END, range.get(), IGNORE_EXCEPTION) > -1) {
</span><del>- if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1)
</del><ins>+ if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
</ins><span class="cx"> // The original range and r intersect.
</span><del>- selection.setSelection(VisibleSelection(r->startPosition(), range->endPosition(), DOWNSTREAM));
- else
</del><ins>+ selection.moveTo(r->startPosition(), range->endPosition(), DOWNSTREAM);
+ } else {
</ins><span class="cx"> // r contains the original range.
</span><del>- selection.setSelection(VisibleSelection(r));
</del><ins>+ selection.moveTo(r);
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> if (r->compareBoundaryPoints(Range::END_TO_START, range.get(), ec) < 1 && !ec) {
</span><del>- if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1)
</del><ins>+ if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
</ins><span class="cx"> // The original range contains r.
</span><del>- selection.setSelection(VisibleSelection(range.get()));
- else
</del><ins>+ selection.moveTo(range.get());
+ } else {
</ins><span class="cx"> // The original range and r intersect.
</span><del>- selection.setSelection(VisibleSelection(range->startPosition(), r->endPosition(), DOWNSTREAM));
</del><ins>+ selection.moveTo(range->startPosition(), r->endPosition(), DOWNSTREAM);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>