Diff
Modified: trunk/LayoutTests/ChangeLog (183608 => 183609)
--- trunk/LayoutTests/ChangeLog 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/LayoutTests/ChangeLog 2015-04-30 03:08:17 UTC (rev 183609)
@@ -1,3 +1,16 @@
+2015-04-29 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
fast/frames/flattening/iframe-flattening-resize-event-count.html times out on Yosemite WK2
Deleted: trunk/LayoutTests/fast/events/wheelevent-in-frame-expected.txt (183608 => 183609)
--- trunk/LayoutTests/fast/events/wheelevent-in-frame-expected.txt 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/LayoutTests/fast/events/wheelevent-in-frame-expected.txt 2015-04-30 03:08:17 UTC (rev 183609)
@@ -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
-
Deleted: trunk/LayoutTests/fast/events/wheelevent-in-frame.html (183608 => 183609)
--- trunk/LayoutTests/fast/events/wheelevent-in-frame.html 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/LayoutTests/fast/events/wheelevent-in-frame.html 2015-04-30 03:08:17 UTC (rev 183609)
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- </style>
- <script src=""
- <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 = '';
- 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>
Deleted: trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt (183608 => 183609)
--- trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt 2015-04-30 03:08:17 UTC (rev 183609)
@@ -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
-
Deleted: trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame.html (183608 => 183609)
--- trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame.html 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/LayoutTests/fast/events/wheelevent-in-reattached-frame.html 2015-04-30 03:08:17 UTC (rev 183609)
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- </style>
- <script src=""
- <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 = '';
- 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>
Modified: trunk/Source/WebCore/ChangeLog (183608 => 183609)
--- trunk/Source/WebCore/ChangeLog 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/Source/WebCore/ChangeLog 2015-04-30 03:08:17 UTC (rev 183609)
@@ -1,3 +1,16 @@
+2015-04-29 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Unreviewed iOS build fix. Unused parameter no longer exists.
Modified: trunk/Source/WebCore/dom/Document.cpp (183608 => 183609)
--- trunk/Source/WebCore/dom/Document.cpp 2015-04-30 03:05:37 UTC (rev 183608)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-30 03:08:17 UTC (rev 183609)
@@ -5949,6 +5949,11 @@
m_wheelEventTargets->add(&node);
+ if (Document* parent = parentDocument()) {
+ parent->didAddWheelEventHandler(*this);
+ return;
+ }
+
wheelEventHandlersChanged();
if (Frame* frame = this->frame())
@@ -5974,6 +5979,11 @@
if (!removeHandlerFromSet(*m_wheelEventTargets, node, removal))
return;
+ if (Document* parent = parentDocument()) {
+ parent->didRemoveWheelEventHandler(*this);
+ return;
+ }
+
wheelEventHandlersChanged();
if (Frame* frame = this->frame())
