Changeset 156761 in webkit for trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

Timestamp:

Oct 1, 2013, 9:20:06 PM (12 years ago)

Author:

[email protected]

Message:

Move mouse event dispatch from Node to Element.
<​https://webkit.org/b/122203>

Reviewed by Anders Carlsson.

We never dispatch mouse events on text or other non-element nodes,
so move the related logic to using Element.

Node::dispatchMouseEvent() moves to Element. I also changed the
relatedTarget argument to be an Element* since the related target
is never a Node either.

Most of this patch is *Node -> *Element renames in EventHandler.

File:

• trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -616 +616 @@
         m_mouseDownWasInUnavailablePluginIndicator = isInUnavailablePluginIndicator(mouseEvent);
         if (m_mouseDownWasInUnavailablePluginIndicator) {
-            frame().eventHandler().setCapturingMouseEventsNode(&element);
+            frame().eventHandler().setCapturingMouseEventsElement(&element);
             element.setIsCapturingMouseEvents(true);
             setUnavailablePluginIndicatorIsPressed(true);
@@ -624 +624 @@
     if (event->type() == eventNames().mouseupEvent && static_cast<MouseEvent*>(event)->button() == LeftButton) {
         if (m_unavailablePluginIndicatorIsPressed) {
-            frame().eventHandler().setCapturingMouseEventsNode(0);
+            frame().eventHandler().setCapturingMouseEventsElement(nullptr);
             element.setIsCapturingMouseEvents(false);
             setUnavailablePluginIndicatorIsPressed(false);