Chromium Code Reviews| Index: Source/web/WebInputEventConversion.cpp |
| diff --git a/Source/web/WebInputEventConversion.cpp b/Source/web/WebInputEventConversion.cpp |
| index 362b99b254876736cbb944ee74d105b86e6a2732..9ef982738a2257ea6d713224832933600f7e99df 100644 |
| --- a/Source/web/WebInputEventConversion.cpp |
| +++ b/Source/web/WebInputEventConversion.cpp |
| @@ -484,12 +484,12 @@ static IntPoint convertAbsoluteLocationForRenderObject(const LayoutPoint& locati |
| return roundedIntPoint(convertAbsoluteLocationForRenderObjectFloat(location, renderObject)); |
| } |
| -static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event, const Widget& widget, const RenderObject& renderObject, WebMouseEvent& webEvent) |
| +static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event, const Widget* widget, const RenderObject& renderObject, WebMouseEvent& webEvent) |
| { |
| webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond; |
| webEvent.modifiers = getWebInputModifiers(event); |
| - ScrollView* view = toScrollView(widget.parent()); |
| + ScrollView* view = widget ? toScrollView(widget->parent()) : 0; |
|
Charlie Reis
2014/10/10 03:42:39
This was a bit awkward, but we don't have a widget
kenrb
2014/10/10 19:59:08
I am guessing webFrame->frame()->view() is null in
Charlie Reis
2014/10/10 20:25:24
Yes, and done.
|
| IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()); |
| if (view) |
| windowPoint = view->contentsToWindow(windowPoint); |
| @@ -519,7 +519,7 @@ WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const RenderObj |
| else |
| return; // Skip all other mouse events. |
| - updateWebMouseEventFromCoreMouseEvent(event, *widget, *renderObject, *this); |
| + updateWebMouseEventFromCoreMouseEvent(event, widget, *renderObject, *this); |
| switch (event.button()) { |
| case LeftButton: |
| @@ -649,7 +649,7 @@ WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const |
| if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames::mousewheel) |
| return; |
| type = WebInputEvent::MouseWheel; |
| - updateWebMouseEventFromCoreMouseEvent(event, *widget, *renderObject, *this); |
| + updateWebMouseEventFromCoreMouseEvent(event, widget, *renderObject, *this); |
| deltaX = -event.deltaX(); |
| deltaY = -event.deltaY(); |
| wheelTicksX = event.ticksX(); |