Changeset 147181 in webkit


Ignore:
Timestamp:
Mar 28, 2013 4:40:28 PM (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r147178 r147181  
     12013-03-28  Alexandre Elias  <aelias@chromium.org>
     2
     3        [chromium] Use widget.parent() for plugin WebMouseEvents
     4        https://bugs.webkit.org/show_bug.cgi?id=113543
     5
     6        Reviewed by James Robinson.
     7
     8        In r142571 I switches widget.parent() to widget.root() in the plugin
     9        WebCore event -> WebMouseEvent creator, to make the converter the
     10        inverse of the one going the other way and avoid null pointer crashes.
     11        But the plugin code expects it to be parent() (see
     12        http://crbug.com/223335).
     13
     14        * src/WebInputEventConversion.cpp:
     15        (WebKit::updateWebMouseEventFromWebCoreMouseEvent):
     16
    1172013-03-28  Xianzhu Wang  <wangxianzhu@chromium.org>
    218
  • trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

    r146894 r147181  
    438438    webEvent.modifiers = getWebInputModifiers(event);
    439439
    440     ScrollView* view = widget.root();
    441     IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
     440    ScrollView* view = widget.parent();
     441    IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
     442    if (view)
     443        windowPoint = view->contentsToWindow(windowPoint);
    442444    webEvent.globalX = event.screenX();
    443445    webEvent.globalY = event.screenY();
Note: See TracChangeset for help on using the changeset viewer.