Unreviewed, rolling out r183600.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Apr 2015 03:08:17 +0000 (03:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Apr 2015 03:08:17 +0000 (03:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144432

New tests time out everywhere (Requested by ap on #webkit).

Reverted changeset:

"Crash at WebCore::Document::absoluteRegionForEventTargets"
https://bugs.webkit.org/show_bug.cgi?id=144426
http://trac.webkit.org/changeset/183600

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/events/wheelevent-in-frame-expected.txt [deleted file]
LayoutTests/fast/events/wheelevent-in-frame.html [deleted file]
LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt [deleted file]
LayoutTests/fast/events/wheelevent-in-reattached-frame.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/dom/Document.cpp

index 10340ab..ce4ba72 100644 (file)
@@ -1,3 +1,16 @@
+2015-04-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183600.
+        https://bugs.webkit.org/show_bug.cgi?id=144432
+
+        New tests time out everywhere (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Crash at WebCore::Document::absoluteRegionForEventTargets"
+        https://bugs.webkit.org/show_bug.cgi?id=144426
+        http://trac.webkit.org/changeset/183600
+
 2015-04-29  Alexey Proskuryakov  <ap@apple.com>
 
         fast/frames/flattening/iframe-flattening-resize-event-count.html times out on Yosemite WK2
diff --git a/LayoutTests/fast/events/wheelevent-in-frame-expected.txt b/LayoutTests/fast/events/wheelevent-in-frame-expected.txt
deleted file mode 100644 (file)
index 96d05f4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Tests that detaching a frame with a wheel event handlers doesn't crash.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/wheelevent-in-frame.html b/LayoutTests/fast/events/wheelevent-in-frame.html
deleted file mode 100644 (file)
index 8788ac3..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <style>
-    </style>
-    <script src="../../resources/js-test-pre.js"></script>
-    <script>
-    </script>
-</head>
-<body>
-
-    <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
-
-    description("Tests that detaching a frame with a wheel event handlers doesn't crash.");
-    
-    const maxLoads = 10;
-    var loadCount = 0;
-
-    function makeFrame()
-    {
-        var frame = document.createElement('iframe');
-        frame.addEventListener('load', function() {
-            if (window.internals)
-                shouldBe("internals.wheelEventHandlerCount()", "0");
-
-            frame.remove();
-            window.setTimeout(checkFrameRemoved, 0);
-        });
-
-        frame.src = 'resources/wheel-event-handler-on-document.html';
-        addFrameToDocument(frame);
-    }
-    
-    function checkFrameRemoved()
-    {
-        gc();
-
-        if (window.internals)
-            shouldBe("internals.wheelEventHandlerCount()", "0");
-
-        if (++loadCount == maxLoads) {
-            isSuccessfullyParsed();
-            if (window.testRunner)
-                testRunner.notifyDone();
-
-            return;
-        }
-
-        window.setTimeout(makeFrame, 0);
-    }
-
-    function addFrameToDocument(frame)
-    {
-        document.body.appendChild(frame);
-    }
-    
-    makeFrame();
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt b/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt
deleted file mode 100644 (file)
index 462ae3a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Tests that detaching and reattaching a frame with a wheel event handlers doesn't crash.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS internals.wheelEventHandlerCount() is 0
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/wheelevent-in-reattached-frame.html b/LayoutTests/fast/events/wheelevent-in-reattached-frame.html
deleted file mode 100644 (file)
index 209cbb0..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <style>
-    </style>
-    <script src="../../resources/js-test-pre.js"></script>
-    <script>
-    </script>
-</head>
-<body>
-
-    <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
-
-    description("Tests that detaching and reattaching a frame with a wheel event handlers doesn't crash.");
-    
-    const maxLoads = 10;
-    var loadCount = 0;
-
-    var frame;
-    function makeFrame()
-    {
-        frame = document.createElement('iframe');
-        frame.addEventListener('load', function() {
-            if (window.internals)
-                shouldBe("internals.wheelEventHandlerCount()", "0");
-
-            frame.remove();
-            window.setTimeout(checkFrameRemoved, 0);
-        });
-
-        frame.src = 'resources/wheel-event-handlers-dynamic.html';
-        addFrameToDocument(frame);
-    }
-    
-    function checkFrameRemoved()
-    {
-        gc();
-
-        if (window.internals)
-            shouldBe("internals.wheelEventHandlerCount()", "0");
-
-        if (++loadCount == maxLoads) {
-            isSuccessfullyParsed();
-            if (window.testRunner)
-                testRunner.notifyDone();
-
-            return;
-        }
-
-        window.setTimeout(function() {
-            addFrameToDocument(frame);
-        }, 0);
-    }
-
-    function addFrameToDocument(frame)
-    {
-        document.body.appendChild(frame);
-    }
-    
-    makeFrame();
-    </script>
-</body>
-</html>
index 496893f..2a59231 100644 (file)
@@ -1,3 +1,16 @@
+2015-04-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183600.
+        https://bugs.webkit.org/show_bug.cgi?id=144432
+
+        New tests time out everywhere (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Crash at WebCore::Document::absoluteRegionForEventTargets"
+        https://bugs.webkit.org/show_bug.cgi?id=144426
+        http://trac.webkit.org/changeset/183600
+
 2015-04-29  Joseph Pecoraro  <pecoraro@apple.com>
 
         Unreviewed iOS build fix. Unused parameter no longer exists.
index 5dae186..5ca8a43 100644 (file)
@@ -5949,6 +5949,11 @@ void Document::didAddWheelEventHandler(Node& node)
 
     m_wheelEventTargets->add(&node);
 
+    if (Document* parent = parentDocument()) {
+        parent->didAddWheelEventHandler(*this);
+        return;
+    }
+
     wheelEventHandlersChanged();
 
     if (Frame* frame = this->frame())
@@ -5974,6 +5979,11 @@ void Document::didRemoveWheelEventHandler(Node& node, EventHandlerRemoval remova
     if (!removeHandlerFromSet(*m_wheelEventTargets, node, removal))
         return;
 
+    if (Document* parent = parentDocument()) {
+        parent->didRemoveWheelEventHandler(*this);
+        return;
+    }
+
     wheelEventHandlersChanged();
 
     if (Frame* frame = this->frame())