<!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>[168019] branches/safari-537.76-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/168019">168019</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 07:29:38 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167167">r167167</a>. <rdar://problem/16701836></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCorehtmlHTMLSelectElementcpp">branches/safari-537.76-branch/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsfastformsselectchangesizeduringfocusexpectedtxt">branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestsfastformsselectchangesizeduringfocushtml">branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168018 => 168019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:25:51 UTC (rev 168018)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:29:38 UTC (rev 168019)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167167
+
+ 2014-04-11 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure changing select element size during focus event
+ dispatch
+ <https://bugs.webkit.org/show_bug.cgi?id=131566>
+ <rdar://problem/16400735>
+
+ Reviewed by Andy Estes.
+
+ * fast/forms/select-change-size-during-focus-expected.txt: Added.
+ * fast/forms/select-change-size-during-focus.html: Added.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r167135
</span><span class="cx">
</span><span class="cx"> 2014-04-10 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastformsselectchangesizeduringfocusexpectedtxtfromrev167167trunkLayoutTestsfastformsselectchangesizeduringfocusexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus-expected.txt (from rev 167167, trunk/LayoutTests/fast/forms/select-change-size-during-focus-expected.txt) (0 => 168019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus-expected.txt 2014-04-30 14:29:38 UTC (rev 168019)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+WebKit bug #131566: Assertion failure changing select element size during focus event dispatch. This test passes if it does not assert in a debug build.
+
+
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastformsselectchangesizeduringfocushtmlfromrev167167trunkLayoutTestsfastformsselectchangesizeduringfocushtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus.html (from rev 167167, trunk/LayoutTests/fast/forms/select-change-size-during-focus.html) (0 => 168019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/forms/select-change-size-during-focus.html 2014-04-30 14:29:38 UTC (rev 168019)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<html>
+ <head>
+ <script>
+ function setup() {
+ if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
+ }
+
+ s = document.getElementById("select");
+
+ s.addEventListener("focus", function() {
+ s.size = 1;
+
+ window.setTimeout(function() {
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+ }, 0);
+ });
+
+ ev = document.createEvent("MouseEvent");
+ ev.initMouseEvent("mousedown", true, true, window, 0, 0, 0, 20, 20, false, false, false, false, 0, null);
+ s.dispatchEvent(ev);
+ }
+ </script>
+ </head>
+ <body onload="setup()">
+ <p>
+ WebKit bug #<a href="https://bugs.webkit.org/show_bug.cgi?id=131566">131566</a>: Assertion failure changing select element size during focus event dispatch. This test passes if it does not assert in a debug build.
+ </p>
+ <select id="select" size="2">
+ <option>option 1</option>
+ <option>option 2</option>
+ </select>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168018 => 168019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:25:51 UTC (rev 168018)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:29:38 UTC (rev 168019)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167167
+
+ 2014-04-11 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure changing select element size during focus event
+ dispatch
+ <https://bugs.webkit.org/show_bug.cgi?id=131566>
+ <rdar://problem/16400735>
+
+ Reviewed by Andy Estes.
+
+ Test: fast/forms/select-change-size-during-focus.html
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
+ Adopt the fix from Chromium r171216; check that the renderer is still
+ of the expected type, and return early if it is not.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r167135
</span><span class="cx">
</span><span class="cx"> 2014-04-10 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/html/HTMLSelectElement.cpp (168018 => 168019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/html/HTMLSelectElement.cpp 2014-04-30 14:25:51 UTC (rev 168018)
+++ branches/safari-537.76-branch/Source/WebCore/html/HTMLSelectElement.cpp 2014-04-30 14:29:38 UTC (rev 168019)
</span><span class="lines">@@ -1301,8 +1301,8 @@
</span><span class="cx">
</span><span class="cx"> if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
</span><span class="cx"> focus();
</span><del>- // Calling focus() may cause us to lose our renderer, in which case do not want to handle the event.
- if (!renderer())
</del><ins>+ // Calling focus() may remove or change our renderer, in which case we don't want to handle the event further.
+ if (!renderer() || !renderer()->isListBox())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Convert to coords relative to the list box if needed.
</span></span></pre>
</div>
</div>
</body>
</html>