Changeset 196801 in webkit

Timestamp:

Feb 18, 2016 10:56:55 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (deleted)
• LayoutTests/fast/events/wheel-event-destroys-frame.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/mac/EventHandlerMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
 2016-02-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
 2016-02-18  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -1009 +1009 @@
 bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea)
 {
+    // We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
+    ASSERT(m_frame.view());
     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;
 
     ScrollLatchingState* latchingState = m_frame.mainFrame().latchingState();