<!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>[210717] branches/safari-603-branch</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/210717">210717</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 22:10:51 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210687">r210687</a>. rdar://problem/29388806</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfasteventstouchioslongpressoneditableexpectedtxt">branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfasteventstouchioslongpressoneditablehtml">branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210716 => 210717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 06:10:48 UTC (rev 210716)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 06:10:51 UTC (rev 210717)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210687. rdar://problem/29388806
+
+ 2017-01-12 Enrica Casucci <enrica@apple.com>
+
+ Do not allow selection of editable content when not editing.
+ https://bugs.webkit.org/show_bug.cgi?id=166897
+ <rdar://problem/29388806>
+
+ Reviewed by Tim Horton.
+
+ * fast/events/touch/ios/long-press-on-editable-expected.txt: Added.
+ * fast/events/touch/ios/long-press-on-editable.html: Added.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210622. rdar://problem/28389364
</span><span class="cx">
</span><span class="cx"> 2017-01-11 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventstouchioslongpressoneditableexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable-expected.txt (0 => 210717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable-expected.txt 2017-01-13 06:10:51 UTC (rev 210717)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS: no selection made
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventstouchioslongpressoneditablehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable.html (0 => 210717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/touch/ios/long-press-on-editable.html 2017-01-13 06:10:51 UTC (rev 210717)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function getPressScript()
+ {
+ return `
+ (function() {
+ uiController.longPressAtPoint(30, 20, function() {
+ uiController.uiScriptComplete();
+ });
+ })();`
+ }
+
+ function runTest()
+ {
+ if (!testRunner.runUIScript)
+ return;
+
+ var output = '';
+ var target = document.getElementById('target');
+ if (testRunner.runUIScript) {
+ testRunner.runUIScript(getPressScript(), function(result) {
+ var selectionText = document.getSelection().toString();
+ if (selectionText == "PressMe")
+ output += 'FAILED: Selected: ' + selectionText;
+ else
+ output += 'PASS: no selection made';
+ output += '<br>';
+ document.getElementById('target').innerHTML = output;
+ testRunner.notifyDone();
+ });
+ }
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <style>
+ #target {
+ height: 100px;
+ width: 200px;
+ background-color: silver;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=1">
+</head>
+<body>
+<div id="target">
+ <textarea>PressMe</textarea>
+ This test requires UIScriptController to run.
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210716 => 210717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:48 UTC (rev 210716)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:51 UTC (rev 210717)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210687. rdar://problem/29388806
+
+ 2017-01-12 Enrica Casucci <enrica@apple.com>
+
+ Do not allow selection of editable content when not editing.
+ https://bugs.webkit.org/show_bug.cgi?id=166897
+ <rdar://problem/29388806>
+
+ Reviewed by Tim Horton.
+
+ Test: fast/events/touch/ios/long-press-on-editable.html
+
+ When retrieving the position information, we should not consider
+ as candidates for selection editable elements, since this is only
+ used for non editable selections.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::isAssistableElement): Moved within the file.
+ (WebKit::WebPage::getPositionInformation):
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210683. rdar://problem/11187315
</span><span class="cx">
</span><span class="cx"> 2017-01-12 Megan Gardner <megan_gardner@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (210716 => 210717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-13 06:10:48 UTC (rev 210716)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-13 06:10:51 UTC (rev 210717)
</span><span class="lines">@@ -2282,6 +2282,20 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool isAssistableElement(Element& node)
+{
+ if (is<HTMLSelectElement>(node))
+ return true;
+ if (is<HTMLTextAreaElement>(node))
+ return true;
+ if (is<HTMLInputElement>(node)) {
+ HTMLInputElement& inputElement = downcast<HTMLInputElement>(node);
+ // FIXME: This laundry list of types is not a good way to factor this. Need a suitable function on HTMLInputElement itself.
+ return inputElement.isTextField() || inputElement.isDateField() || inputElement.isDateTimeLocalField() || inputElement.isMonthField() || inputElement.isTimeField();
+ }
+ return node.isContentEditable();
+}
+
</ins><span class="cx"> void WebPage::getPositionInformation(const InteractionInformationRequest& request, InteractionInformationAtPosition& info)
</span><span class="cx"> {
</span><span class="cx"> info.request = request;
</span><span class="lines">@@ -2435,7 +2449,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> info.isSelectable = renderer->style().userSelect() != SELECT_NONE;
</span><span class="cx"> if (info.isSelectable && !hitNode->isTextNode())
</span><del>- info.isSelectable = !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame());
</del><ins>+ info.isSelectable = !isAssistableElement(*downcast<Element>(hitNode)) && !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2497,20 +2511,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isAssistableElement(Element& node)
-{
- if (is<HTMLSelectElement>(node))
- return true;
- if (is<HTMLTextAreaElement>(node))
- return true;
- if (is<HTMLInputElement>(node)) {
- HTMLInputElement& inputElement = downcast<HTMLInputElement>(node);
- // FIXME: This laundry list of types is not a good way to factor this. Need a suitable function on HTMLInputElement itself.
- return inputElement.isTextField() || inputElement.isDateField() || inputElement.isDateTimeLocalField() || inputElement.isMonthField() || inputElement.isTimeField();
- }
- return node.isContentEditable();
-}
-
</del><span class="cx"> static inline Element* nextAssistableElement(Node* startNode, Page& page, bool isForward)
</span><span class="cx"> {
</span><span class="cx"> if (!is<Element>(startNode))
</span></span></pre>
</div>
</div>
</body>
</html>