<!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>[214567] 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/214567">214567</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 15:41:23 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214291">r214291</a>. rdar://problem/30922110</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsTestExpectations">branches/safari-603-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlshadowSliderThumbElementcpp">branches/safari-603-branch/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastformsrangerangeremoveondragexpectedtxt">branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsrangerangeremoveondraghtml">branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag.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 (214566 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 22:12:25 UTC (rev 214566)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-29 Jason Marcell <jmarcell@apple.com>
+
+ Merge r214291. rdar://problem/30922110
+
+ 2017-03-22 Jiewen Tan <jiewen_tan@apple.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION hit when removing an <input type="range"> while dragging on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=165535
+ <rdar://problem/29559749>
+
+ Reviewed by Ryosuke Niwa.
+
+ This test case is only enabled in iOS simulator WK2.
+
+ * TestExpectations:
+ * fast/forms/range/range-remove-on-drag-expected.txt: Added.
+ * fast/forms/range/range-remove-on-drag.html: Added.
+
</ins><span class="cx"> 2017-03-28 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r214365. rdar://problem/30922115
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/TestExpectations (214566 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/TestExpectations 2017-03-29 22:12:25 UTC (rev 214566)
+++ branches/safari-603-branch/LayoutTests/TestExpectations 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -1064,3 +1064,6 @@
</span><span class="cx">
</span><span class="cx"> animations/font-variations
</span><span class="cx"> fast/text/variations
</span><ins>+
+# Test only works on iOS WK2. webkit.org/b/165535
+fast/forms/range/range-remove-on-drag.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsrangerangeremoveondragexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag-expected.txt (0 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag-expected.txt 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 10: Test Passed! WebKit didn't crash.
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsrangerangeremoveondraghtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag.html (0 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/range/range-remove-on-drag.html 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script>
+ count = 0;
+ function finish()
+ {
+ count = count + 1;
+ if (count == 2 && window.testRunner) {
+ console.log("Test Passed! WebKit didn't crash.")
+ testRunner.notifyDone();
+ }
+ }
+ function remove(event)
+ {
+ event.target.remove();
+ finish();
+ }
+ </script>
+ </head>
+ <body>
+ <input id="input" type="range" style="width: 500px;" oninput="remove(event)">
+ <script>
+ function getDragUIScript(startX, startY, endX, endY)
+ {
+ return `
+ (function() {
+ uiController.dragFromPointToPoint(${startX}, ${startY}, ${endX}, ${endY}, 0.15, function() {
+ uiController.uiScriptComplete("Dispatched Drag");
+ });
+ })();`
+ }
+
+ onload = function() {
+ var input = document.getElementById("input");
+ var centerX = input.offsetLeft + input.offsetWidth / 2;
+ var centerY = input.offsetTop + input.offsetHeight / 2;
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.runUIScript(getDragUIScript(centerX, centerY, input.offsetLeft + input.offsetWidth, centerY), function(result) { finish(); });
+ }
+ };
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214566 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 22:12:25 UTC (rev 214566)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-03-29 Jason Marcell <jmarcell@apple.com>
+
+ Merge r214291. rdar://problem/30922110
+
+ 2017-03-22 Jiewen Tan <jiewen_tan@apple.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION hit when removing an <input type="range"> while dragging on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=165535
+ <rdar://problem/29559749>
+
+ Reviewed by Ryosuke Niwa.
+
+ Utimately we should prevent SliderThumbElement::unregisterForTouchEvents() being called while
+ updating render tree. A quick fix for this is to move dispatchFormControlChangeEvent for input
+ from stopDragging up to the callers which really needs to dispatch this event, i.e., finishing
+ dragging the slider. It is clear that not every caller of stopDragging wants to
+ dispatchFormControlChangeEvent.
+
+ Test: fast/forms/range/range-remove-on-drag.html
+
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::stopDragging):
+ (WebCore::SliderThumbElement::defaultEventHandler):
+ (WebCore::SliderThumbElement::handleTouchEndAndCancel):
+
</ins><span class="cx"> 2017-03-28 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r214365. rdar://problem/30922115
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/shadow/SliderThumbElement.cpp (214566 => 214567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/shadow/SliderThumbElement.cpp 2017-03-29 22:12:25 UTC (rev 214566)
+++ branches/safari-603-branch/Source/WebCore/html/shadow/SliderThumbElement.cpp 2017-03-29 22:41:23 UTC (rev 214567)
</span><span class="lines">@@ -335,10 +335,6 @@
</span><span class="cx"> m_inDragMode = false;
</span><span class="cx"> if (renderer())
</span><span class="cx"> renderer()->setNeedsLayout();
</span><del>-
- RefPtr<HTMLInputElement> input = hostInput();
- if (input)
- input->dispatchFormControlChangeEvent();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -369,6 +365,7 @@
</span><span class="cx"> startDragging();
</span><span class="cx"> return;
</span><span class="cx"> } else if (eventType == eventNames().mouseupEvent && isLeftButton) {
</span><ins>+ input->dispatchFormControlChangeEvent();
</ins><span class="cx"> stopDragging();
</span><span class="cx"> return;
</span><span class="cx"> } else if (eventType == eventNames().mousemoveEvent) {
</span><span class="lines">@@ -499,6 +496,9 @@
</span><span class="cx">
</span><span class="cx"> clearExclusiveTouchIdentifier();
</span><span class="cx">
</span><ins>+ RefPtr<HTMLInputElement> input = hostInput();
+ if (input)
+ input->dispatchFormControlChangeEvent();
</ins><span class="cx"> stopDragging();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>