Title: [92098] trunk
- Revision
- 92098
- Author
- [email protected]
- Date
- 2011-07-31 21:25:01 -0700 (Sun, 31 Jul 2011)
Log Message
Unreviewed, rolling out r92094.
http://trac.webkit.org/changeset/92094
https://bugs.webkit.org/show_bug.cgi?id=65443
Triggered many asserts (Requested by abarth on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-07-31
Source/WebCore:
* dom/EventDispatcher.cpp:
(WebCore::EventDispatcher::dispatchEvent):
LayoutTests:
* fast/events/event-target-reset-expected.txt: Removed.
* fast/events/event-target-reset.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (92097 => 92098)
--- trunk/LayoutTests/ChangeLog 2011-08-01 04:17:06 UTC (rev 92097)
+++ trunk/LayoutTests/ChangeLog 2011-08-01 04:25:01 UTC (rev 92098)
@@ -1,3 +1,14 @@
+2011-07-31 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92094.
+ http://trac.webkit.org/changeset/92094
+ https://bugs.webkit.org/show_bug.cgi?id=65443
+
+ Triggered many asserts (Requested by abarth on #webkit).
+
+ * fast/events/event-target-reset-expected.txt: Removed.
+ * fast/events/event-target-reset.html: Removed.
+
2011-07-31 Dominic Cooney <[email protected]>
Event target set to null post event dispatch
Deleted: trunk/LayoutTests/fast/events/event-target-reset-expected.txt (92097 => 92098)
--- trunk/LayoutTests/fast/events/event-target-reset-expected.txt 2011-08-01 04:17:06 UTC (rev 92097)
+++ trunk/LayoutTests/fast/events/event-target-reset-expected.txt 2011-08-01 04:25:01 UTC (rev 92098)
@@ -1,7 +0,0 @@
-Tests that events don't have their target reset to null after being dispatched.
-
-PASS event.target.tagName == "IFRAME"
-PASS savedEvent.target.tagName == "IFRAME"
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/events/event-target-reset.html (92097 => 92098)
--- trunk/LayoutTests/fast/events/event-target-reset.html 2011-08-01 04:17:06 UTC (rev 92097)
+++ trunk/LayoutTests/fast/events/event-target-reset.html 2011-08-01 04:25:01 UTC (rev 92098)
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p id="description">
-Tests that events don't have their target reset to null after being
-dispatched.
-</p>
-<pre id="console"></pre>
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-// We do ad-hoc logging and assertions here because external scripts
-// generate their own load events that complicate the test.
-
-function log(msg) {
- document.querySelector('#console').appendChild(document.createTextNode(msg + '\n'));
-}
-
-function shouldBeTrue(condition) {
- var msg = (eval(condition) ? 'PASS ' : 'FAIL ') + condition;
- log(msg);
-}
-
-var savedEvent;
-
-function saveEvent(event) {
- shouldBeTrue('event.target.tagName == "IFRAME"');
- savedEvent = event;
- window.setTimeout(checkSavedEvent, 0);
-}
-
-function checkSavedEvent() {
- shouldBeTrue('savedEvent.target.tagName == "IFRAME"');
- log('\nTEST COMPLETE');
-
- if (window.layoutTestController)
- layoutTestController.notifyDone();
-}
-
-document.addEventListener('load', saveEvent, true);
-document.write('<iframe></iframe>');
-</script>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (92097 => 92098)
--- trunk/Source/WebCore/ChangeLog 2011-08-01 04:17:06 UTC (rev 92097)
+++ trunk/Source/WebCore/ChangeLog 2011-08-01 04:25:01 UTC (rev 92098)
@@ -1,3 +1,14 @@
+2011-07-31 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92094.
+ http://trac.webkit.org/changeset/92094
+ https://bugs.webkit.org/show_bug.cgi?id=65443
+
+ Triggered many asserts (Requested by abarth on #webkit).
+
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventDispatcher::dispatchEvent):
+
2011-07-31 Dominic Cooney <[email protected]>
Event target set to null post event dispatch
Modified: trunk/Source/WebCore/dom/EventDispatcher.cpp (92097 => 92098)
--- trunk/Source/WebCore/dom/EventDispatcher.cpp 2011-08-01 04:17:06 UTC (rev 92097)
+++ trunk/Source/WebCore/dom/EventDispatcher.cpp 2011-08-01 04:25:01 UTC (rev 92098)
@@ -364,12 +364,7 @@
// Ensure that after event dispatch, the event's target object is the
// outermost shadow DOM boundary.
- if (topEventContext())
- event->setTarget(topEventContext()->target());
- else {
- ASSERT(!m_node->isInShadowTree());
- event->setTarget(m_node.get());
- }
+ event->setTarget(windowContext.target());
event->setCurrentTarget(0);
InspectorInstrumentation::didDispatchEvent(cookie);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
