<!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>[165150] branches/safari-537.75-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/165150">165150</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 17:34:53 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/158724">r158724</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorehtmlRangeInputTypecpp">branches/safari-537.75-branch/Source/WebCore/html/RangeInputType.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsfastformsrangerangetypechangeonchange2expectedtxt">branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestsfastformsrangerangetypechangeonchange2html">branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165149 => 165150)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 01:28:19 UTC (rev 165149)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 01:34:53 UTC (rev 165150)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r158724.
+
+ 2013-11-05 Ryosuke Niwa <rniwa@webkit.org>
+
+ Use-after-free in SliderThumbElement::dragFrom
+ https://bugs.webkit.org/show_bug.cgi?id=123873
+
+ Reviewed by Andreas Kling.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/04a23bfca2d04101a1828d36ff36c29f3a24f34b
+
+ * fast/forms/range/range-type-change-onchange-2-expected.txt: Added.
+ * fast/forms/range/range-type-change-onchange-2.html: Added.
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r163599.
</span><span class="cx">
</span><span class="cx"> 2014-02-06 Jeffrey Pfau <jpfau@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastformsrangerangetypechangeonchange2expectedtxtfromrev158724trunkLayoutTestsfastformsrangerangetypechangeonchange2expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2-expected.txt (from rev 158724, trunk/LayoutTests/fast/forms/range/range-type-change-onchange-2-expected.txt) (0 => 165150)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2-expected.txt 2014-03-06 01:34:53 UTC (rev 165150)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test if drag on a padding area of input[type=range] do not trigger an assertion failure.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS if not crashed.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastformsrangerangetypechangeonchange2htmlfromrev158724trunkLayoutTestsfastformsrangerangetypechangeonchange2html"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2.html (from rev 158724, trunk/LayoutTests/fast/forms/range/range-type-change-onchange-2.html) (0 => 165150)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/forms/range/range-type-change-onchange-2.html 2014-03-06 01:34:53 UTC (rev 165150)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<body>
+<style>
+input {
+ padding-right: 32px;
+ padding-top: 32px;
+}
+</style>
+<input onchange="this.type = 'text';" type="range" id="input">
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+function keyDownMouseClick(x1, y1, x2, y2) {
+ if (!window.eventSender)
+ return;
+ eventSender.mouseMoveTo(x1, y1);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(x2, y2);
+ eventSender.mouseUp();
+}
+
+window.onload = function() {
+ var input = document.getElementById("input");
+ input.focus();
+ keyDownMouseClick(input.offsetLeft + input.offsetWidth - 32, input.offsetTop, 0, 0);
+ description('Test if drag on a padding area of input[type=range] do not trigger an assertion failure.');
+ testPassed('if not crashed.');
+ finishJSTest();
+};
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165149 => 165150)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 01:28:19 UTC (rev 165149)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 01:34:53 UTC (rev 165150)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r158724.
+
+ 2013-11-05 Ryosuke Niwa <rniwa@webkit.org>
+
+ Use-after-free in SliderThumbElement::dragFrom
+ https://bugs.webkit.org/show_bug.cgi?id=123873
+
+ Reviewed by Andreas Kling.
+
+ Ref the SliderThumbElement since it could go away inside dragFrom.
+
+ Test: fast/forms/range/range-type-change-onchange-2.html
+
+ * html/RangeInputType.cpp:
+ (WebCore::RangeInputType::handleMouseDownEvent):
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r163599.
</span><span class="cx">
</span><span class="cx"> 2014-02-06 Jeffrey Pfau <jpfau@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorehtmlRangeInputTypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/html/RangeInputType.cpp (165149 => 165150)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/html/RangeInputType.cpp 2014-03-06 01:28:19 UTC (rev 165149)
+++ branches/safari-537.75-branch/Source/WebCore/html/RangeInputType.cpp 2014-03-06 01:34:53 UTC (rev 165150)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> ASSERT(element()->shadow());
</span><span class="cx"> if (targetNode != element() && !targetNode->isDescendantOf(element()->userAgentShadowRoot()))
</span><span class="cx"> return;
</span><del>- SliderThumbElement* thumb = sliderThumbElementOf(element());
</del><ins>+ RefPtr<SliderThumbElement> thumb = sliderThumbElementOf(element());
</ins><span class="cx"> if (targetNode == thumb)
</span><span class="cx"> return;
</span><span class="cx"> thumb->dragFrom(event->absoluteLocation());
</span></span></pre>
</div>
</div>
</body>
</html>