Changeset 106572 in webkit

Timestamp:

Feb 2, 2012 11:03:29 AM (12 years ago)

Author:

andersca@apple.com

Message:

NPAPI will not send mouse up events when mouse is outside plugin area
​https://bugs.webkit.org/show_bug.cgi?id=77657
<rdar://problem/10160674>

Reviewed by Andreas Kling.

Source/WebCore:

Export EventHandler::setCapturingMouseEventsNode.

• WebCore.exp.in:

Source/WebKit2:

Use EventHandler::setCapturingMouseEventsNode to ensure we get all the mouse events when the mouse is down.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::handleEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-02  Anders Carlsson  <andersca@apple.com>
+
+        NPAPI will not send mouse up events when mouse is outside plugin area
+        https://bugs.webkit.org/show_bug.cgi?id=77657
+        <rdar://problem/10160674>
+
+        Reviewed by Andreas Kling.
+
+        Export EventHandler::setCapturingMouseEventsNode.
+
+        * WebCore.exp.in:
+
 2012-02-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -237 +237 @@
 __ZN7WebCore12EventHandler23handleMouseReleaseEventERKNS_18PlatformMouseEventE
 __ZN7WebCore12EventHandler24logicalScrollRecursivelyENS_22ScrollLogicalDirectionENS_17ScrollGranularityEPNS_4NodeE
+__ZN7WebCore12EventHandler27setCapturingMouseEventsNodeEN3WTF10PassRefPtrINS_4NodeEEE
 __ZN7WebCore12EventHandler31passMouseMovedEventToScrollbarsEP7NSEvent
 __ZN7WebCore12EventHandler31passMouseMovedEventToScrollbarsERKNS_18PlatformMouseEventE

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-02  Anders Carlsson  <andersca@apple.com>
+
+        NPAPI will not send mouse up events when mouse is outside plugin area
+        https://bugs.webkit.org/show_bug.cgi?id=77657
+        <rdar://problem/10160674>
+
+        Reviewed by Andreas Kling.
+
+        Use EventHandler::setCapturingMouseEventsNode to ensure we get all the mouse events when the mouse is down.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::handleEvent):
+
 2012-02-02  Claudio Saavedra  <csaavedra@igalia.com> and Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -632 +632 @@
 
         // FIXME: Clicking in a scroll bar should not change focus.
-        if (currentEvent->type() == WebEvent::MouseDown)
+        if (currentEvent->type() == WebEvent::MouseDown) {
             focusPluginElement();
+            frame()->eventHandler()->setCapturingMouseEventsNode(m_pluginElement.get());
+        } else if (currentEvent->type() == WebEvent::MouseUp)
+            frame()->eventHandler()->setCapturingMouseEventsNode(0);
 
         didHandleEvent = m_plugin->handleMouseEvent(static_cast<const WebMouseEvent&>(*currentEvent));