<!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>[192433] trunk</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/192433">192433</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2015-11-13 10:36:31 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Element::focus() should acquire the ownership of Frame.
https://bugs.webkit.org/show_bug.cgi?id=150204
<rdar://problem/23136794>
Reviewed by Brent Fulgham.
Source/WebCore:
The FrameSelection::setSelection method sometimes releases the last reference to a frame.
When this happens, the Element::updateFocusAppearance would attempt to use dereferenced memory.
Instead, we should ensure that the Frame lifetime is guaranteed to extend through the duration
of the method call.
Test: editing/selection/focus-iframe-removal-crash.html
* dom/Element.cpp:
(WebCore::Element::updateFocusAppearance):
LayoutTests:
* editing/selection/focus-iframe-removal-crash-expected.txt: Added.
* editing/selection/focus-iframe-removal-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectionfocusiframeremovalcrashexpectedtxt">trunk/LayoutTests/editing/selection/focus-iframe-removal-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectionfocusiframeremovalcrashhtml">trunk/LayoutTests/editing/selection/focus-iframe-removal-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192432 => 192433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-13 18:11:42 UTC (rev 192432)
+++ trunk/LayoutTests/ChangeLog 2015-11-13 18:36:31 UTC (rev 192433)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-13 Jiewen Tan <jiewen_tan@apple.com>
+
+ Element::focus() should acquire the ownership of Frame.
+ https://bugs.webkit.org/show_bug.cgi?id=150204
+ <rdar://problem/23136794>
+
+ Reviewed by Brent Fulgham.
+
+ * editing/selection/focus-iframe-removal-crash-expected.txt: Added.
+ * editing/selection/focus-iframe-removal-crash.html: Added.
+
</ins><span class="cx"> 2015-11-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Hardware keyboard spacebar scrolls too far on iOS
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectionfocusiframeremovalcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/focus-iframe-removal-crash-expected.txt (0 => 192433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/focus-iframe-removal-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/focus-iframe-removal-crash-expected.txt 2015-11-13 18:36:31 UTC (rev 192433)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS. WebKit didn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectionfocusiframeremovalcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/focus-iframe-removal-crash.html (0 => 192433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/focus-iframe-removal-crash.html (rev 0)
+++ trunk/LayoutTests/editing/selection/focus-iframe-removal-crash.html 2015-11-13 18:36:31 UTC (rev 192433)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<iframe></iframe>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function run()
+{
+ var iframe = document.getElementsByTagName('iframe')[0];
+ iframe.contentDocument.documentElement.contentEditable = true;
+ iframe.contentDocument.documentElement.addEventListener('focusout', function () {
+ iframe.parentNode.removeChild(iframe);
+ }, false);
+ iframe.contentDocument.documentElement.focus();
+
+ document.write("PASS. WebKit didn't crash.");
+}
+
+document.addEventListener('DOMContentLoaded', run);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192432 => 192433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-13 18:11:42 UTC (rev 192432)
+++ trunk/Source/WebCore/ChangeLog 2015-11-13 18:36:31 UTC (rev 192433)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-13 Jiewen Tan <jiewen_tan@apple.com>
+
+ Element::focus() should acquire the ownership of Frame.
+ https://bugs.webkit.org/show_bug.cgi?id=150204
+ <rdar://problem/23136794>
+
+ Reviewed by Brent Fulgham.
+
+ The FrameSelection::setSelection method sometimes releases the last reference to a frame.
+ When this happens, the Element::updateFocusAppearance would attempt to use dereferenced memory.
+ Instead, we should ensure that the Frame lifetime is guaranteed to extend through the duration
+ of the method call.
+
+ Test: editing/selection/focus-iframe-removal-crash.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::updateFocusAppearance):
+
</ins><span class="cx"> 2015-11-13 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Remove unused GridResolvedPosition constructor
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (192432 => 192433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-11-13 18:11:42 UTC (rev 192432)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-11-13 18:36:31 UTC (rev 192433)
</span><span class="lines">@@ -2252,7 +2252,8 @@
</span><span class="cx"> void Element::updateFocusAppearance(SelectionRestorationMode, SelectionRevealMode revealMode)
</span><span class="cx"> {
</span><span class="cx"> if (isRootEditableElement()) {
</span><del>- Frame* frame = document().frame();
</del><ins>+ // Keep frame alive in this method, since setSelection() may release the last reference to |frame|.
+ RefPtr<Frame> frame = document().frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>