Diff
Modified: trunk/LayoutTests/ChangeLog (196871 => 196872)
--- trunk/LayoutTests/ChangeLog 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/LayoutTests/ChangeLog 2016-02-21 18:18:32 UTC (rev 196872)
@@ -1,3 +1,17 @@
+2016-02-21 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r196866.
+ https://bugs.webkit.org/show_bug.cgi?id=154515
+
+ still crashy on EFL/GTK (Requested by smfr 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/196866
+
2016-02-20 Simon Fraser <[email protected]>
Wheel event callback removing the window causes crash in WebCore.
Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (196871 => 196872)
--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt 2016-02-21 18:18:32 UTC (rev 196872)
@@ -1,3 +0,0 @@
-This test should not crash
-
-
Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html (196871 => 196872)
--- trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html 2016-02-21 18:18:32 UTC (rev 196872)
@@ -1,39 +0,0 @@
-<!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="" here</body>"></iframe>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (196871 => 196872)
--- trunk/Source/WebCore/ChangeLog 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/ChangeLog 2016-02-21 18:18:32 UTC (rev 196872)
@@ -1,3 +1,17 @@
+2016-02-21 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r196866.
+ https://bugs.webkit.org/show_bug.cgi?id=154515
+
+ still crashy on EFL/GTK (Requested by smfr 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/196866
+
2016-02-20 Simon Fraser <[email protected]>
Wheel event callback removing the window causes crash in WebCore.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (196871 => 196872)
--- trunk/Source/WebCore/page/EventHandler.cpp 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-02-21 18:18:32 UTC (rev 196872)
@@ -452,7 +452,9 @@
m_mousePressed = false;
m_capturesDragging = false;
m_capturingMouseEventsElement = nullptr;
- clearLatchedState();
+#if PLATFORM(MAC)
+ m_frame.mainFrame().resetLatchingState();
+#endif
#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
m_originatingTouchPointTargets.clear();
m_originatingTouchPointDocument = nullptr;
@@ -2662,8 +2664,7 @@
#if PLATFORM(MAC)
m_frame.mainFrame().resetLatchingState();
#endif
- if (WheelEventDeltaFilter* filter = m_frame.mainFrame().wheelEventDeltaFilter())
- filter->endFilteringDeltas();
+ m_frame.mainFrame().wheelEventDeltaFilter()->endFilteringDeltas();
}
void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEvent)
Modified: trunk/Source/WebCore/page/Frame.cpp (196871 => 196872)
--- trunk/Source/WebCore/page/Frame.cpp 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/page/Frame.cpp 2016-02-21 18:18:32 UTC (rev 196872)
@@ -251,8 +251,7 @@
if (m_view)
m_view->unscheduleRelayout();
- if (m_view != view)
- eventHandler().clear();
+ eventHandler().clear();
m_view = WTFMove(view);
Modified: trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp (196871 => 196872)
--- trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp 2016-02-21 18:18:32 UTC (rev 196872)
@@ -31,8 +31,6 @@
#endif
#include "FloatSize.h"
-#include "Logging.h"
-#include "TextStream.h"
namespace WebCore {
@@ -60,7 +58,6 @@
FloatSize WheelEventDeltaFilter::filteredDelta() const
{
- LOG_WITH_STREAM(Scrolling, stream << "BasicWheelEventDeltaFilter::filteredDelta returning " << m_currentFilteredDelta);
return m_currentFilteredDelta;
}
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196871 => 196872)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-21 18:18:32 UTC (rev 196872)
@@ -1008,10 +1008,9 @@
bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea)
{
- FrameView* view = m_frame.view();
// We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
- if (!view)
- return false;
+ ASSERT(m_frame.view());
+ FrameView* view = m_frame.view();
ScrollLatchingState* latchingState = m_frame.mainFrame().latchingState();
if (wheelEvent.useLatchedEventElement() && !latchingIsLockedToAncestorOfThisFrame(m_frame) && latchingState && latchingState->scrollableContainer()) {
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (196871 => 196872)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-02-21 06:14:38 UTC (rev 196871)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-02-21 18:18:32 UTC (rev 196872)
@@ -2349,8 +2349,6 @@
if (!box)
return;
- LOG_WITH_STREAM(Scrolling, stream << "RenderLayer::scrollTo " << position);
-
ScrollPosition newPosition = position;
if (box->style().overflowX() != OMARQUEE) {
// Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
