<!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>[196837] 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/196837">196837</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-02-19 14:59:25 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Wheel event callback removing the window causes crash in WebCore.
https://bugs.webkit.org/show_bug.cgi?id=150871
Reviewed by Brent Fulgham.
Source/WebCore:
Null check the FrameView before using it, since the iframe may have been removed
from its parent document inside the event handler.
The new test triggered a cross-load side-effect, where wheel event filtering wasn't
reset between page loads. Fix by calling clearLatchedState() in EventHandler::clear(),
which resets the filtering.
Test: fast/events/wheel-event-destroys-frame.html
* page/EventHandler.cpp:
(WebCore::EventHandler::clear):
* page/WheelEventDeltaFilter.cpp:
(WebCore::WheelEventDeltaFilter::filteredDelta):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformCompleteWheelEvent):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo):
LayoutTests:
* fast/events/wheel-event-destroys-frame-expected.txt: Added.
* fast/events/wheel-event-destroys-frame.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="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageWheelEventDeltaFiltercpp">trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added 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 (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/LayoutTests/ChangeLog 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-02-19 Simon Fraser <simon.fraser@apple.com>
+
+ Wheel event callback removing the window causes crash in WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=150871
+
+ Reviewed by Brent Fulgham.
+
+ * fast/events/wheel-event-destroys-frame-expected.txt: Added.
+ * fast/events/wheel-event-destroys-frame.html: Added.
+
</ins><span class="cx"> 2016-02-19 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator traverses normal children for elements with empty shadow root
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventswheeleventdestroysframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (0 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test should not crash
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventswheeleventdestroysframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html (0 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html (rev 0)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!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>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/Source/WebCore/ChangeLog 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-02-19 Simon Fraser <simon.fraser@apple.com>
+
+ Wheel event callback removing the window causes crash in WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=150871
+
+ Reviewed by Brent Fulgham.
+
+ Null check the FrameView before using it, since the iframe may have been removed
+ from its parent document inside the event handler.
+
+ The new test triggered a cross-load side-effect, where wheel event filtering wasn't
+ reset between page loads. Fix by calling clearLatchedState() in EventHandler::clear(),
+ which resets the filtering.
+
+ Test: fast/events/wheel-event-destroys-frame.html
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::clear):
+ * page/WheelEventDeltaFilter.cpp:
+ (WebCore::WheelEventDeltaFilter::filteredDelta):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformCompleteWheelEvent):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo):
+
</ins><span class="cx"> 2016-02-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] [SVG -> OTF Converter] All uses of a font except the first one are invisible
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -452,9 +452,7 @@
</span><span class="cx"> m_mousePressed = false;
</span><span class="cx"> m_capturesDragging = false;
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><del>-#if PLATFORM(MAC)
- m_frame.mainFrame().resetLatchingState();
-#endif
</del><ins>+ clearLatchedState();
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> m_originatingTouchPointTargets.clear();
</span><span class="cx"> m_originatingTouchPointDocument = nullptr;
</span><span class="lines">@@ -2664,7 +2662,8 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> m_frame.mainFrame().resetLatchingState();
</span><span class="cx"> #endif
</span><del>- m_frame.mainFrame().wheelEventDeltaFilter()->endFilteringDeltas();
</del><ins>+ if (WheelEventDeltaFilter* filter = m_frame.mainFrame().wheelEventDeltaFilter())
+ filter->endFilteringDeltas();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEvent)
</span></span></pre></div>
<a id="trunkSourceWebCorepageWheelEventDeltaFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include "FloatSize.h"
</span><ins>+#include "Logging.h"
+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -58,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> FloatSize WheelEventDeltaFilter::filteredDelta() const
</span><span class="cx"> {
</span><ins>+ LOG_WITH_STREAM(Scrolling, stream << "BasicWheelEventDeltaFilter::filteredDelta returning " << m_currentFilteredDelta);
</ins><span class="cx"> return m_currentFilteredDelta;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -1008,9 +1008,10 @@
</span><span class="cx">
</span><span class="cx"> bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea)
</span><span class="cx"> {
</span><ins>+ FrameView* view = m_frame.view();
</ins><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>- ASSERT(m_frame.view());
- FrameView* view = m_frame.view();
</del><ins>+ if (!view)
+ return false;
</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>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (196836 => 196837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-02-19 22:56:31 UTC (rev 196836)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-02-19 22:59:25 UTC (rev 196837)
</span><span class="lines">@@ -2349,6 +2349,8 @@
</span><span class="cx"> if (!box)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG_WITH_STREAM(Scrolling, stream << "RenderLayer::scrollTo " << position);
+
</ins><span class="cx"> ScrollPosition newPosition = position;
</span><span class="cx"> if (box->style().overflowX() != OMARQUEE) {
</span><span class="cx"> // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
</span></span></pre>
</div>
</div>
</body>
</html>