Title: [196801] trunk
- Revision
- 196801
- Author
- [email protected]
- Date
- 2016-02-18 22:56:55 -0800 (Thu, 18 Feb 2016)
Log 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
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (196800 => 196801)
--- trunk/LayoutTests/ChangeLog 2016-02-19 06:53:54 UTC (rev 196800)
+++ trunk/LayoutTests/ChangeLog 2016-02-19 06:56:55 UTC (rev 196801)
@@ -1,3 +1,18 @@
+2016-02-18 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
window.history / window.navigator should not be replaceable
Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame-expected.txt (196800 => 196801)
--- 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)
@@ -1,3 +0,0 @@
-This test should not crash
-
-
Deleted: trunk/LayoutTests/fast/events/wheel-event-destroys-frame.html (196800 => 196801)
--- 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)
@@ -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 (196800 => 196801)
--- 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)
@@ -1,5 +1,20 @@
2016-02-18 Commit Queue <[email protected]>
+ 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 <[email protected]>
+
Unreviewed, rolling out r196791.
https://bugs.webkit.org/show_bug.cgi?id=154438
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196800 => 196801)
--- 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)
@@ -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()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
