Changeset 156815 in webkit

Timestamp:

Oct 2, 2013 6:32:43 PM (11 years ago)

Author:

akling@apple.com

Message:

CTTE: Drag events are only dispatched on Elements.
<​https://webkit.org/b/122250>

Reviewed by Antti Koivisto.

We never dispatch drag events on non-Element nodes so tighten up the
code to operate on Elements instead.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (11 diffs)
• page/EventHandler.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-02  Andreas Kling  <akling@apple.com>
+
+        CTTE: Drag events are only dispatched on Elements.
+        <https://webkit.org/b/122250>
+
+        Reviewed by Antti Koivisto.
+
+        We never dispatch drag events on non-Element nodes so tighten up the
+        code to operate on Elements instead.
+
 2013-10-02  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1966 +1966 @@
 #if ENABLE(DRAG_SUPPORT)
 
-bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Node* dragTarget, const PlatformMouseEvent& event, Clipboard* clipboard)
+bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, Clipboard* clipboard)
 {
     FrameView* view = m_frame.view();
@@ -1984 +1984 @@
         0, 0, clipboard);
 
-    dragTarget->dispatchEvent(me.get(), IGNORE_EXCEPTION);
+    dragTarget.dispatchEvent(me.get(), IGNORE_EXCEPTION);
     return me->defaultPrevented();
 }
@@ -2098 +2098 @@
     MouseEventWithHitTestResults mev = prepareMouseEvent(request, event);
 
-    // Drag events should never go to text nodes (following IE, and proper mouseover/out dispatch)
-    RefPtr<Node> newTarget = mev.targetNode();
-    if (newTarget && newTarget->isTextNode())
-        newTarget = newTarget->parentOrShadowHostElement();
+    RefPtr<Element> newTarget;
+    if (Node* targetNode = mev.targetNode()) {
+        // Drag events should never go to non-element nodes (following IE, and proper mouseover/out dispatch)
+        if (!targetNode->isElementNode())
+            newTarget = targetNode->parentOrShadowHostElement();
+        else
+            newTarget = toElement(targetNode);
+    }
 
     m_autoscrollController->updateDragAndDrop(newTarget.get(), event.position(), event.timestamp());
@@ -2121 +2125 @@
                 dispatchDragSrcEvent(eventNames().dragEvent, event);
             }
-            accept = dispatchDragEvent(eventNames().dragenterEvent, newTarget.get(), event, clipboard);
+            accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, clipboard);
             if (!accept)
                 accept = findDropZone(newTarget.get(), clipboard);
@@ -2130 +2134 @@
                 accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
         } else if (m_dragTarget)
-            dispatchDragEvent(eventNames().dragleaveEvent, m_dragTarget.get(), event, clipboard);
+            dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
 
         if (newTarget) {
@@ -2148 +2152 @@
                 dispatchDragSrcEvent(eventNames().dragEvent, event);
             }
-            accept = dispatchDragEvent(eventNames().dragoverEvent, newTarget.get(), event, clipboard);
+            accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, clipboard);
             if (!accept)
                 accept = findDropZone(newTarget.get(), clipboard);
@@ -2154 +2158 @@
         }
     }
-    m_dragTarget = newTarget;
-
+    m_dragTarget = newTarget.release();
     return accept;
 }
@@ -2165 +2168 @@
         if (targetFrame)
             targetFrame->eventHandler().cancelDragAndDrop(event, clipboard);
-    } else if (m_dragTarget.get()) {
+    } else if (m_dragTarget) {
         if (dragState().source && dragState().shouldDispatchEvents)
             dispatchDragSrcEvent(eventNames().dragEvent, event);
-        dispatchDragEvent(eventNames().dragleaveEvent, m_dragTarget.get(), event, clipboard);
+        dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
     }
     clearDragState();
@@ -2180 +2183 @@
         if (targetFrame)
             preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, clipboard);
-    } else if (m_dragTarget.get())
-        preventedDefault = dispatchDragEvent(eventNames().dropEvent, m_dragTarget.get(), event, clipboard);
+    } else if (m_dragTarget)
+        preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, clipboard);
     clearDragState();
     return preventedDefault;
@@ -2189 +2192 @@
 {
     stopAutoscrollTimer();
-    m_dragTarget = 0;
+    m_dragTarget = nullptr;
     m_capturingMouseEventsElement = nullptr;
     m_shouldOnlyFireDragOverEvent = false;
@@ -3536 +3539 @@
 bool EventHandler::dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent& event)
 {
-    return !dispatchDragEvent(eventType, dragState().source.get(), event, dragState().clipboard.get());
+    return !dispatchDragEvent(eventType, *dragState().source, event, dragState().clipboard.get());
 }
     

trunk/Source/WebCore/page/EventHandler.h

@@ -329 +329 @@
     bool dispatchMouseEvent(const AtomicString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder);
 #if ENABLE(DRAG_SUPPORT)
-    bool dispatchDragEvent(const AtomicString& eventType, Node* target, const PlatformMouseEvent&, Clipboard*);
+    bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, Clipboard*);
 
     void freeClipboard();
@@ -462 +462 @@
 
 #if ENABLE(DRAG_SUPPORT)
-    RefPtr<Node> m_dragTarget;
+    RefPtr<Element> m_dragTarget;
     bool m_shouldOnlyFireDragOverEvent;
 #endif