<!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>[214687] 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/214687">214687</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-03-31 14:46:42 -0700 (Fri, 31 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Tapping editable text inside of a range selection no longer changes the selection to a caret
https://bugs.webkit.org/show_bug.cgi?id=170327
<rdar://problem/31363816>
Reviewed by Tim Horton.
Source/WebKit2:
Currently, we're forcing all text interaction gestures to duck in lieu of data interaction gestures
when we should only be doing so for gestures that begin a loupe. This prevents other gestures, such as
single taps, from changing the selection when they should be allowed to.
Hooks into new UIKit SPI to make this tweak.
Introduces a new LayoutTest: editing/selection/caret-after-tap-in-editable-selection.html.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView pointIsInAssistedNode:]):
(-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
LayoutTests:
Adds a new WK2 interaction test for iOS verifying that tapping a selection in editable content sets the selection
to a caret, rather than maintaining the range selection. This test is disabled in OpenSource, since it relies on
synthetic touch events.
* TestExpectations:
* editing/selection/caret-after-tap-in-editable-selection-expected.txt: Added.
* editing/selection/caret-after-tap-in-editable-selection.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectioncaretaftertapineditableselectionexpectedtxt">trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectioncaretaftertapineditableselectionhtml">trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214686 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-31 21:22:05 UTC (rev 214686)
+++ trunk/LayoutTests/ChangeLog 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-31 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [WK2] Tapping editable text inside of a range selection no longer changes the selection to a caret
+ https://bugs.webkit.org/show_bug.cgi?id=170327
+ <rdar://problem/31363816>
+
+ Reviewed by Tim Horton.
+
+ Adds a new WK2 interaction test for iOS verifying that tapping a selection in editable content sets the selection
+ to a caret, rather than maintaining the range selection. This test is disabled in OpenSource, since it relies on
+ synthetic touch events.
+
+ * TestExpectations:
+ * editing/selection/caret-after-tap-in-editable-selection-expected.txt: Added.
+ * editing/selection/caret-after-tap-in-editable-selection.html: Added.
+
</ins><span class="cx"> 2017-03-31 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark fast/mediastream/MediaStream-page-muted.html as flaky for
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (214686 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2017-03-31 21:22:05 UTC (rev 214686)
+++ trunk/LayoutTests/TestExpectations 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx">
</span><span class="cx"> # This test only makes sense on iOS
</span><span class="cx"> fast/attachment/attachment-wrapping-action.html
</span><ins>+editing/selection/caret-after-tap-in-editable-selection.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # Only iOS has selection UI drawn by UIKit
</span><span class="cx"> editing/selection/character-granularity-rect.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectioncaretaftertapineditableselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection-expected.txt (0 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection-expected.txt 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Here's to the crazy ones. The misfits. The rebels. The troublemakers. The round pegs in the square holes.
+The ones who see things differently. They're not fond of rules. And they have no respect for the status quo.
+You can quote them, disagree with them, glorify or vilify them. About the only thing you can't do is ignore them.
+Because they change things. They push the human race forward. And while some may see them as the crazy ones, we see genius.
+Because the people who are crazy enough to think they can change the world, are the ones who do.
+Expanded selection to range.
+Collapsed selection to caret.
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectioncaretaftertapineditableselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection.html (0 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection.html (rev 0)
+++ trunk/LayoutTests/editing/selection/caret-after-tap-in-editable-selection.html 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<meta name=viewport content="width=device-width, initial-scale=1">
+<body contenteditable height="100%">
+ <div>Here's to the crazy ones. The misfits. The rebels. The troublemakers. The round pegs in the square holes.</div>
+ <div>The ones who see things differently. They're not fond of rules. And they have no respect for the status quo.</div>
+ <div>You can quote them, disagree with them, glorify or vilify them. About the only thing you can't do is ignore them.</div>
+ <div>Because they change things. They push the human race forward. And while some may see them as the crazy ones, we see genius.</div>
+ <div>Because the people who are crazy enough to think they can change the world, are the ones who do.</div>
+ <div id="output" style="color: green; margin-top: 1em;"></div>
+</body>
+<script>
+ function tapInEditorToShowKeyboardScript()
+ {
+ return `
+ (() => {
+ uiController.didShowKeyboardCallback = () => {
+ uiController.uiScriptComplete();
+ };
+ uiController.singleTapAtPoint(50, 50, () => { });
+ })();`;
+ }
+
+ function tapInEditorScript()
+ {
+ return `
+ (() => {
+ uiController.singleTapAtPoint(50, 50, () => {
+ uiController.uiScriptComplete();
+ });
+ })();`;
+ }
+
+ function appendOutput(message)
+ {
+ let code = document.createElement("code");
+ code.appendChild(document.createTextNode(message));
+ output.appendChild(code);
+ output.appendChild(document.createElement("br"));
+ }
+
+ (() => {
+ let hasSeenRangeSelection = false;
+ document.designMode = "on";
+ document.addEventListener("selectionchange", () => {
+ if (!getSelection().rangeCount)
+ return;
+
+ let selectionIsCollapsed = getSelection().getRangeAt(0).collapsed;
+ if (!selectionIsCollapsed) {
+ appendOutput("Expanded selection to range.");
+ hasSeenRangeSelection = true;
+ }
+ if (hasSeenRangeSelection && selectionIsCollapsed) {
+ appendOutput("Collapsed selection to caret.");
+ testRunner.notifyDone();
+ }
+ });
+
+ if (!window.testRunner) {
+ appendOutput("To manually test, make a selection and tap inside of it. This should result in a caret selection.");
+ return;
+ }
+
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.runUIScript(tapInEditorToShowKeyboardScript(), () => {
+ document.execCommand("SelectAll");
+ testRunner.runUIScript(tapInEditorScript(), () => { });
+ });
+ })();
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214686 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-31 21:22:05 UTC (rev 214686)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-31 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [WK2] Tapping editable text inside of a range selection no longer changes the selection to a caret
+ https://bugs.webkit.org/show_bug.cgi?id=170327
+ <rdar://problem/31363816>
+
+ Reviewed by Tim Horton.
+
+ Currently, we're forcing all text interaction gestures to duck in lieu of data interaction gestures
+ when we should only be doing so for gestures that begin a loupe. This prevents other gestures, such as
+ single taps, from changing the selection when they should be allowed to.
+
+ Hooks into new UIKit SPI to make this tweak.
+ Introduces a new LayoutTest: editing/selection/caret-after-tap-in-editable-selection.html.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView pointIsInAssistedNode:]):
+ (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
+
</ins><span class="cx"> 2017-03-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Mail can get stuck underneath FindController::findStringMatches after searching in a long message
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (214686 => 214687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-03-31 21:22:05 UTC (rev 214686)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-03-31 21:46:42 UTC (rev 214687)
</span><span class="lines">@@ -1481,13 +1481,18 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)pointIsInAssistedNode:(CGPoint)point
</span><span class="cx"> {
</span><ins>+ // This method is still implemented for backwards compatibility with older UIKit versions.
+ return [self textInteractionGesture:UIWKGestureLoupe shouldBeginAtPoint:point];
+}
+
+- (BOOL)textInteractionGesture:(UIWKGestureType)gesture shouldBeginAtPoint:(CGPoint)point
+{
</ins><span class="cx"> InteractionInformationRequest request(roundedIntPoint(point));
</span><span class="cx"> [self ensurePositionInformationIsUpToDate:request];
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_INTERACTION)
</span><del>- if (_positionInformation.hasSelectionAtPosition) {
</del><ins>+ if (_positionInformation.hasSelectionAtPosition && gesture == UIWKGestureLoupe) {
</ins><span class="cx"> // If the position might initiate data interaction, we don't want to change the selection.
</span><del>- // FIXME: This should be renamed to something more precise, such as textInteractionShouldRecognizeGestureAtPoint:
</del><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>