<!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>[189704] releases/WebKitGTK/webkit-2.10</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/189704">189704</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 03:04:20 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188918">r188918</a> - Fix crash due to search field disappearing when showing results menu
https://bugs.webkit.org/show_bug.cgi?id=148410
<rdar://problem/22399850>
Reviewed by Brent Fulgham.
When clicking on the results button of a search field that hides upon being focused, WebKit will crash because we
attempt to toggle the results menu using the search field's renderer which is null. This is addressed by adding a null
check to make sure the search field has not been hidden before toggling the menu.
Test: fast/forms/search/search-results-hidden-crash.html
* html/shadow/TextControlInnerElements.cpp:
(WebCore::SearchFieldResultsButtonElement::defaultEventHandler): Add a null check for the search field's renderer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlshadowTextControlInnerElementscpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastformssearchsearchresultshiddencrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastformssearchsearchresultshiddencrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastformssearchsearchresultshiddencrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt (0 => 189704)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt 2015-09-14 10:04:20 UTC (rev 189704)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+We did not crash!
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastformssearchsearchresultshiddencrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash.html (0 => 189704)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/search/search-results-hidden-crash.html 2015-09-14 10:04:20 UTC (rev 189704)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<html>
+
+<head>
+ <script>
+ function hideSearchField() {
+ var search = document.getElementsByTagName("input")[0];
+ search.style.display = "none";
+ }
+
+ function setup() {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ window.eventSender.mouseMoveTo(10, 10);
+ window.eventSender.mouseDown();
+ window.eventSender.mouseUp();
+ }
+ }
+ </script>
+
+ <style>
+ body, input {
+ margin: 0;
+ }
+ </style>
+</head>
+
+<body onload="setup()">
+ <input onfocus="hideSearchField()" type="search" results="5"></input>
+ <p>We did not crash!</p>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189703 => 189704)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 09:57:37 UTC (rev 189703)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 10:04:20 UTC (rev 189704)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Fix crash due to search field disappearing when showing results menu
+ https://bugs.webkit.org/show_bug.cgi?id=148410
+ <rdar://problem/22399850>
+
+ Reviewed by Brent Fulgham.
+
+ When clicking on the results button of a search field that hides upon being focused, WebKit will crash because we
+ attempt to toggle the results menu using the search field's renderer which is null. This is addressed by adding a null
+ check to make sure the search field has not been hidden before toggling the menu.
+
+ Test: fast/forms/search/search-results-hidden-crash.html
+
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SearchFieldResultsButtonElement::defaultEventHandler): Add a null check for the search field's renderer.
+
</ins><span class="cx"> 2015-08-23 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove SVGFrameLoaderClient and dataProtocolFrameLoader
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/TextControlInnerElements.cpp (189703 => 189704)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-09-14 09:57:37 UTC (rev 189703)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-09-14 10:04:20 UTC (rev 189704)
</span><span class="lines">@@ -147,11 +147,13 @@
</span><span class="cx"> input->focus();
</span><span class="cx"> input->select();
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- RenderSearchField& renderer = downcast<RenderSearchField>(*input->renderer());
- if (renderer.popupIsVisible())
- renderer.hidePopup();
- else if (input->maxResults() > 0)
- renderer.showPopup();
</del><ins>+ if (RenderObject* renderer = input->renderer()) {
+ RenderSearchField& searchFieldRenderer = downcast<RenderSearchField>(*renderer);
+ if (searchFieldRenderer.popupIsVisible())
+ searchFieldRenderer.hidePopup();
+ else if (input->maxResults() > 0)
+ searchFieldRenderer.showPopup();
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>