Changeset 147181 in webkit

Timestamp:

Mar 28, 2013, 4:40:28 PM (12 years ago)

Author:

aelias@chromium.org

Message:

[chromium] Use widget.parent() for plugin WebMouseEvents
​https://bugs.webkit.org/show_bug.cgi?id=113543

Reviewed by James Robinson.

In r142571 I switches widget.parent() to widget.root() in the plugin
WebCore event -> WebMouseEvent creator, to make the converter the
inverse of the one going the other way and avoid null pointer crashes.
But the plugin code expects it to be parent() (see
​http://crbug.com/223335).

• src/WebInputEventConversion.cpp:

(WebKit::updateWebMouseEventFromWebCoreMouseEvent):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebInputEventConversion.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-03-28  Alexandre Elias  <aelias@chromium.org>
+
+        [chromium] Use widget.parent() for plugin WebMouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=113543
+
+        Reviewed by James Robinson.
+
+        In r142571 I switches widget.parent() to widget.root() in the plugin
+        WebCore event -> WebMouseEvent creator, to make the converter the
+        inverse of the one going the other way and avoid null pointer crashes.
+        But the plugin code expects it to be parent() (see
+        http://crbug.com/223335).
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::updateWebMouseEventFromWebCoreMouseEvent):
+
 2013-03-28  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -438 +438 @@
     webEvent.modifiers = getWebInputModifiers(event);
 
-    ScrollView* view = widget.root();
-    IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
+    ScrollView* view = widget.parent();
+    IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
+    if (view)
+        windowPoint = view->contentsToWindow(windowPoint);
     webEvent.globalX = event.screenX();
     webEvent.globalY = event.screenY();