Changeset 56195 in webkit

Timestamp:

Mar 18, 2010 2:39:58 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=36325

Reviewed by Oliver Hunt.

Add support for stopImmediatePropagation from DOM Level 3 Events.

Added fast/events/stop-immediate-propagation.html.

• dom/Event.cpp:

(WebCore::Event::Event):

• dom/Event.h:

(WebCore::Event::timeStamp):
(WebCore::Event::stopPropagation):
(WebCore::Event::stopImmediatePropagation):
(WebCore::Event::propagationStopped):
(WebCore::Event::immediatePropagationStopped):

• dom/Event.idl:
• dom/EventTarget.cpp:

(WebCore::EventTarget::fireEventListeners):

Location:

trunk

Files:

• LayoutTests/fast/events/stop-immediate-propagation-expected.txt (added)
• LayoutTests/fast/events/stop-immediate-propagation.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Event.cpp (modified) (2 diffs)
• WebCore/dom/Event.h (modified) (3 diffs)
• WebCore/dom/Event.idl (modified) (1 diff)
• WebCore/dom/EventTarget.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-18  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36325
+
+        Add support for stopImmediatePropagation from DOM Level 3 Events.
+
+        Added fast/events/stop-immediate-propagation.html.
+
+        * dom/Event.cpp:
+        (WebCore::Event::Event):
+        * dom/Event.h:
+        (WebCore::Event::timeStamp):
+        (WebCore::Event::stopPropagation):
+        (WebCore::Event::stopImmediatePropagation):
+        (WebCore::Event::propagationStopped):
+        (WebCore::Event::immediatePropagationStopped):
+        * dom/Event.idl:
+        * dom/EventTarget.cpp:
+        (WebCore::EventTarget::fireEventListeners):
+
 2010-03-18  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/dom/Event.cpp

@@ -33 +33 @@
     , m_cancelable(false)
     , m_propagationStopped(false)
+    , m_immediatePropagationStopped(false)
     , m_defaultPrevented(false)
     , m_defaultHandled(false)
@@ -48 +49 @@
     , m_cancelable(cancelableArg)
     , m_propagationStopped(false)
+    , m_immediatePropagationStopped(false)
     , m_defaultPrevented(false)
     , m_defaultHandled(false)

trunk/WebCore/dom/Event.h

@@ -89 +89 @@
         bool cancelable() const { return m_cancelable; }
         DOMTimeStamp timeStamp() const { return m_createTime; }
+
         void stopPropagation() { m_propagationStopped = true; }
-
+        void stopImmediatePropagation() { m_immediatePropagationStopped = true; }
+        
         // IE Extensions
         EventTarget* srcElement() const { return target(); } // MSIE extension - "the object that fired the event"
@@ -132 +134 @@
         bool fromUserGesture();
         
-        bool propagationStopped() const { return m_propagationStopped; }
+        bool propagationStopped() const { return m_propagationStopped || m_immediatePropagationStopped; }
+        bool immediatePropagationStopped() const { return m_immediatePropagationStopped; }
 
         bool defaultPrevented() const { return m_defaultPrevented; }
@@ -168 +171 @@
 
         bool m_propagationStopped;
+        bool m_immediatePropagationStopped;
         bool m_defaultPrevented;
         bool m_defaultHandled;

trunk/WebCore/dom/Event.idl

@@ -69 +69 @@
         // DOM Level 3 Additions.
         readonly attribute boolean defaultPrevented;
+        void stopImmediatePropagation();
 
         // IE Extensions

trunk/WebCore/dom/EventTarget.cpp

@@ -293 +293 @@
         if (event->eventPhase() == Event::BUBBLING_PHASE && registeredListener.useCapture)
             continue;
+
+        // If stopImmediatePropagation has been called, we just break out immediately, without
+        // handling any more events on this target.
+        if (event->immediatePropagationStopped())
+            break;
+
         // To match Mozilla, the AT_TARGET phase fires both capturing and bubbling
         // event listeners, even though that violates some versions of the DOM spec.