<!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>[212096] 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/212096">212096</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 00:16:28 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212029">r212029</a>. rdar://problem/30376972</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomEventcpp">branches/safari-603-branch/Source/WebCore/dom/Event.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomEventh">branches/safari-603-branch/Source/WebCore/dom/Event.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfasteventscurrentTargetgccrashexpectedtxt">branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfasteventscurrentTargetgccrashhtml">branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash.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 (212095 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 08:16:24 UTC (rev 212095)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212029. rdar://problem/30376972
+
+ 2017-02-09 Chris Dumez <cdumez@apple.com>
+
+ Make sure Event keeps its current target element alive
+ https://bugs.webkit.org/show_bug.cgi?id=167885
+ <rdar://problem/30376972>
+
+ Reviewed by Brent Fulgham.
+
+ Add layout test reproducing the crash.
+
+ * fast/events/currentTarget-gc-crash-expected.txt: Added.
+ * fast/events/currentTarget-gc-crash.html: Added.
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212028. rdar://problem/30234133
</span><span class="cx">
</span><span class="cx"> 2017-02-09 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventscurrentTargetgccrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash-expected.txt (0 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash-expected.txt 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This test passes if it does not crash
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventscurrentTargetgccrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash.html (0 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/currentTarget-gc-crash.html 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+function f1() {
+ var iframe = document.getElementById("iframe");
+ iframe.srcdoc = "x";
+ window.frames.event = window.event;
+ gc();
+}
+function f2() {
+ var h = new XMLHttpRequest();
+ h.onreadystatechange = f1;
+ h.open("foo", "1");
+ var e = window.event;
+ e.initEvent("1", true, true);
+ try {
+ e.currentTarget.click();
+ } catch(e) { }
+ setTimeout(finishJSTest, 100);
+}
+</script>
+</head>
+<body onload="f1()">
+<script>
+description("This test passes if it does not crash");
+jsTestIsAsync = true;
+</script>
+<iframe id="iframe" onload="f2()"></iframe>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212095 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 08:16:24 UTC (rev 212095)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212029. rdar://problem/30376972
+
+ 2017-02-09 Chris Dumez <cdumez@apple.com>
+
+ Make sure Event keeps its current target element alive
+ https://bugs.webkit.org/show_bug.cgi?id=167885
+ <rdar://problem/30376972>
+
+ Reviewed by Brent Fulgham.
+
+ Make sure Event keeps its current target element alive to avoid
+ crashes if it is accessed by JS after it has been garbage collected.
+
+ Test: fast/events/currentTarget-gc-crash.html
+
+ * dom/Event.cpp:
+ (WebCore::Event::setCurrentTarget):
+ * dom/Event.h:
+ (WebCore::Event::currentTarget):
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212028. rdar://problem/30234133
</span><span class="cx">
</span><span class="cx"> 2017-02-09 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Event.cpp (212095 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Event.cpp 2017-02-10 08:16:24 UTC (rev 212095)
+++ branches/safari-603-branch/Source/WebCore/dom/Event.cpp 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -200,6 +200,11 @@
</span><span class="cx"> receivedTarget();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Event::setCurrentTarget(EventTarget* currentTarget)
+{
+ m_currentTarget = currentTarget;
+}
+
</ins><span class="cx"> Vector<EventTarget*> Event::composedPath() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_eventPath)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Event.h (212095 => 212096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Event.h 2017-02-10 08:16:24 UTC (rev 212095)
+++ branches/safari-603-branch/Source/WebCore/dom/Event.h 2017-02-10 08:16:28 UTC (rev 212096)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> EventTarget* target() const { return m_target.get(); }
</span><span class="cx"> void setTarget(RefPtr<EventTarget>&&);
</span><span class="cx">
</span><del>- EventTarget* currentTarget() const { return m_currentTarget; }
- void setCurrentTarget(EventTarget* currentTarget) { m_currentTarget = currentTarget; }
</del><ins>+ EventTarget* currentTarget() const { return m_currentTarget.get(); }
+ void setCurrentTarget(EventTarget*);
</ins><span class="cx">
</span><span class="cx"> unsigned short eventPhase() const { return m_eventPhase; }
</span><span class="cx"> void setEventPhase(unsigned short eventPhase) { m_eventPhase = eventPhase; }
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> bool m_isExecutingPassiveEventListener { false };
</span><span class="cx">
</span><span class="cx"> unsigned short m_eventPhase { 0 };
</span><del>- EventTarget* m_currentTarget { nullptr };
</del><ins>+ RefPtr<EventTarget> m_currentTarget;
</ins><span class="cx"> const EventPath* m_eventPath { nullptr };
</span><span class="cx"> RefPtr<EventTarget> m_target;
</span><span class="cx"> DOMTimeStamp m_createTime;
</span></span></pre>
</div>
</div>
</body>
</html>