From: commit-queue@webkit.org Date: Thu, 30 Apr 2015 03:08:17 +0000 (+0000) Subject: Unreviewed, rolling out r183600. X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=b7cceb87efa51d471b84514cb87b5b21cb64701b 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 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183609 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 10340ab..ce4ba72 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,16 @@ +2015-04-29 Commit Queue + + 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 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 index 96d05f4..0000000 --- a/LayoutTests/fast/events/wheelevent-in-frame-expected.txt +++ /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 index 8788ac3..0000000 --- a/LayoutTests/fast/events/wheelevent-in-frame.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - 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 index 462ae3a..0000000 --- a/LayoutTests/fast/events/wheelevent-in-reattached-frame-expected.txt +++ /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 index 209cbb0..0000000 --- a/LayoutTests/fast/events/wheelevent-in-reattached-frame.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 496893f..2a59231 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2015-04-29 Commit Queue + + 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 Unreviewed iOS build fix. Unused parameter no longer exists. diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 5dae186..5ca8a43 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -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())