<!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>[197024] 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/197024">197024</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 02:41:11 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/195949">r195949</a>): [GTK] Test /webkit2/WebKitWebView/insert/link is failing since <a href="http://trac.webkit.org/projects/webkit/changeset/195949">r195949</a>
https://bugs.webkit.org/show_bug.cgi?id=153747
Reviewed by Michael Catanzaro.
Source/WebCore:
Do not return early when reaching a boundary if there's a range
selection. In that case, the selection will be cleared and
accessibility will be notified.
Test: editing/selection/move-to-line-boundary-clear-selection.html
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::modify):
LayoutTests:
Add test to check that moving to line boundary clears the
selection even if the cursor is already at the boundary.
* editing/selection/move-to-line-boundary-clear-selection-expected.txt: Added.
* editing/selection/move-to-line-boundary-clear-selection.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="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectionmovetolineboundaryclearselectionexpectedtxt">trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectionmovetolineboundaryclearselectionhtml">trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197023 => 197024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-24 10:12:54 UTC (rev 197023)
+++ trunk/LayoutTests/ChangeLog 2016-02-24 10:41:11 UTC (rev 197024)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r195949): [GTK] Test /webkit2/WebKitWebView/insert/link is failing since r195949
+ https://bugs.webkit.org/show_bug.cgi?id=153747
+
+ Reviewed by Michael Catanzaro.
+
+ Add test to check that moving to line boundary clears the
+ selection even if the cursor is already at the boundary.
+
+ * editing/selection/move-to-line-boundary-clear-selection-expected.txt: Added.
+ * editing/selection/move-to-line-boundary-clear-selection.html: Added.
+
</ins><span class="cx"> 2016-02-23 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Swap the order of columns/rows in grid-gap shorthand
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectionmovetolineboundaryclearselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection-expected.txt (0 => 197024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection-expected.txt 2016-02-24 10:41:11 UTC (rev 197024)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS getSelection().toString() is ''
+PASS getSelection().toString() is ''
+webkit
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectionmovetolineboundaryclearselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection.html (0 => 197024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection.html (rev 0)
+++ trunk/LayoutTests/editing/selection/move-to-line-boundary-clear-selection.html 2016-02-24 10:41:11 UTC (rev 197024)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<pre id="console"></pre>
+<script>
+function log(s) {
+ document.getElementById("console").innerHTML += s + "\n";
+}
+
+</script>
+<div contenteditable><span id="span">webkit</span></div>
+<script>
+var span = document.getElementById("span");
+getSelection().setPosition(span, 0);
+getSelection().modify("extend", "forward", "line");
+if (window.testRunner)
+ testRunner.execCommand("MoveToEndOfLine");
+shouldBe('getSelection().toString()', "''");
+getSelection().empty();
+getSelection().setPosition(span, 5);
+getSelection().modify("extend", "backward", "line");
+if (window.testRunner)
+ testRunner.execCommand("MoveToBeginningOfLine");
+shouldBe('getSelection().toString()', "''");
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197023 => 197024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-24 10:12:54 UTC (rev 197023)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 10:41:11 UTC (rev 197024)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r195949): [GTK] Test /webkit2/WebKitWebView/insert/link is failing since r195949
+ https://bugs.webkit.org/show_bug.cgi?id=153747
+
+ Reviewed by Michael Catanzaro.
+
+ Do not return early when reaching a boundary if there's a range
+ selection. In that case, the selection will be cleared and
+ accessibility will be notified.
+
+ Test: editing/selection/move-to-line-boundary-clear-selection.html
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::modify):
+
</ins><span class="cx"> 2016-02-24 Alejandro G. Castro <alex@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Gstreamer] Mediaplayer should observe the tracks and not the source
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (197023 => 197024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2016-02-24 10:12:54 UTC (rev 197023)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2016-02-24 10:41:11 UTC (rev 197024)
</span><span class="lines">@@ -1252,14 +1252,14 @@
</span><span class="cx">
</span><span class="cx"> willBeModified(alter, direction);
</span><span class="cx">
</span><del>- bool shouldNotify = false;
</del><ins>+ bool reachedBoundary = false;
</ins><span class="cx"> bool wasRange = m_selection.isRange();
</span><span class="cx"> Position originalStartPosition = m_selection.start();
</span><span class="cx"> VisiblePosition position;
</span><span class="cx"> switch (direction) {
</span><span class="cx"> case DirectionRight:
</span><span class="cx"> if (alter == AlterationMove)
</span><del>- position = modifyMovingRight(granularity, &shouldNotify);
</del><ins>+ position = modifyMovingRight(granularity, &reachedBoundary);
</ins><span class="cx"> else
</span><span class="cx"> position = modifyExtendingRight(granularity);
</span><span class="cx"> break;
</span><span class="lines">@@ -1267,11 +1267,11 @@
</span><span class="cx"> if (alter == AlterationExtend)
</span><span class="cx"> position = modifyExtendingForward(granularity);
</span><span class="cx"> else
</span><del>- position = modifyMovingForward(granularity, &shouldNotify);
</del><ins>+ position = modifyMovingForward(granularity, &reachedBoundary);
</ins><span class="cx"> break;
</span><span class="cx"> case DirectionLeft:
</span><span class="cx"> if (alter == AlterationMove)
</span><del>- position = modifyMovingLeft(granularity, &shouldNotify);
</del><ins>+ position = modifyMovingLeft(granularity, &reachedBoundary);
</ins><span class="cx"> else
</span><span class="cx"> position = modifyExtendingLeft(granularity);
</span><span class="cx"> break;
</span><span class="lines">@@ -1279,11 +1279,11 @@
</span><span class="cx"> if (alter == AlterationExtend)
</span><span class="cx"> position = modifyExtendingBackward(granularity);
</span><span class="cx"> else
</span><del>- position = modifyMovingBackward(granularity, &shouldNotify);
</del><ins>+ position = modifyMovingBackward(granularity, &reachedBoundary);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
- if (shouldNotify && userTriggered == UserTriggered && m_frame && AXObjectCache::accessibilityEnabled()) {
</del><ins>+
+ if (reachedBoundary && !isRange() && userTriggered == UserTriggered && m_frame && AXObjectCache::accessibilityEnabled()) {
</ins><span class="cx"> notifyAccessibilityForSelectionChange({ AXTextStateChangeTypeSelectionBoundary, textSelectionWithDirectionAndGranularity(direction, granularity) });
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>