<!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>[196801] 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/196801">196801</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-18 22:56:55 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/196790">r196790</a>.
https://bugs.webkit.org/show_bug.cgi?id=154439
made fast/events/wheelevent-basic-actual.txt fail in WK2
(Requested by alexchristensen on #webkit).
Reverted changeset:
"Wheel event callback removing the window causes crash in
WebCore."
https://bugs.webkit.org/show_bug.cgi?id=150871
http://trac.webkit.org/changeset/196790</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="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventswheeleventdestroysframeexpectedtxt">trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventswheeleventdestroysframehtml">trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196800 => 196801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/LayoutTests/ChangeLog 2016-02-19 06:56:55 UTC (rev 196801)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-18 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r196790.
+ https://bugs.webkit.org/show_bug.cgi?id=154439
+
+ made fast/events/wheelevent-basic-actual.txt fail in WK2
+ (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Wheel event callback removing the window causes crash in
+ WebCore."
+ https://bugs.webkit.org/show_bug.cgi?id=150871
+ http://trac.webkit.org/changeset/196790
+
</ins><span class="cx"> 2016-02-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> window.history / window.navigator should not be replaceable
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventswheeleventdestroysframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (196800 => 196801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt 2016-02-19 06:56:55 UTC (rev 196801)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-This test should not crash
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventswheeleventdestroysframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html (196800 => 196801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html 2016-02-19 06:56:55 UTC (rev 196801)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <script>
- if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
- }
-
- function frameLoaded(iframe)
- {
- iframe.contentWindow.addEventListener('wheel', function() {
- // Removing the window during event firing causes crash.
- window.document.body.removeChild(iframe);
- window.setTimeout(function() {
- if (window.testRunner)
- testRunner.notifyDone();
- }, 0);
- });
-
- if (!window.eventSender)
- return;
-
- var iframeTarget = document.getElementById('iframe');
- var iframeBounds = iframeTarget.getBoundingClientRect();
-
- eventSender.mouseMoveTo(iframeBounds.left + 10, iframeBounds.top + 10);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
- }
- </script>
-</head>
-<body>
- <p>This test should not crash</p>
- <iframe id="iframe" onload="frameLoaded(this)" src="data:text/html,<body>Wheel here</body>"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196800 => 196801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/Source/WebCore/ChangeLog 2016-02-19 06:56:55 UTC (rev 196801)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-02-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r196790.
+ https://bugs.webkit.org/show_bug.cgi?id=154439
+
+ made fast/events/wheelevent-basic-actual.txt fail in WK2
+ (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Wheel event callback removing the window causes crash in
+ WebCore."
+ https://bugs.webkit.org/show_bug.cgi?id=150871
+ http://trac.webkit.org/changeset/196790
+
+2016-02-18 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r196791.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154438
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196800 => 196801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-19 06:56:55 UTC (rev 196801)
</span><span class="lines">@@ -1008,10 +1008,9 @@
</span><span class="cx">
</span><span class="cx"> bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea)
</span><span class="cx"> {
</span><del>- FrameView* view = m_frame.view();
</del><span class="cx"> // We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
</span><del>- if (!view)
- return false;
</del><ins>+ ASSERT(m_frame.view());
+ FrameView* view = m_frame.view();
</ins><span class="cx">
</span><span class="cx"> ScrollLatchingState* latchingState = m_frame.mainFrame().latchingState();
</span><span class="cx"> if (wheelEvent.useLatchedEventElement() && !latchingIsLockedToAncestorOfThisFrame(m_frame) && latchingState && latchingState->scrollableContainer()) {
</span></span></pre>
</div>
</div>
</body>
</html>