Chromium Code Reviews| Index: content/renderer/pepper/event_conversion.cc |
| diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc |
| index 20e1ce8e4b47a8f4f11f00accec64a1cab5e7afe..dc1b3e4f6511ede64ae4dde612de4de874b60130 100644 |
| --- a/content/renderer/pepper/event_conversion.cc |
| +++ b/content/renderer/pepper/event_conversion.cc |
| @@ -80,6 +80,9 @@ static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISLEFT) == |
| static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISRIGHT) == |
| static_cast<int>(WebInputEvent::IsRight), |
| "IsRight should match"); |
| +static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISERASER) == |
| + static_cast<int>(WebInputEvent::IsEraser), |
| + "IsEraser should match"); |
|
bbudge
2016/08/30 20:46:36
Eliminate.
denniskempin
2016/08/30 21:09:41
Done.
|
| PP_InputEvent_Type ConvertEventTypes(WebInputEvent::Type wetype) { |
| switch (wetype) { |
| @@ -187,6 +190,9 @@ void AppendMouseEvent(const WebInputEvent& event, |
| const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event); |
| InputEventData result = GetEventWithCommonFieldsAndType(event); |
| result.event_modifiers = mouse_event.modifiers; |
| + if (mouse_event.pointerType == blink::WebPointerProperties::PointerType::Eraser) { |
|
bradnelson
2016/08/30 18:19:29
Keep it under 80 columns
denniskempin
2016/08/30 20:49:34
Done.
|
| + result.event_modifiers |= PP_INPUTEVENT_MODIFIER_ISERASER; |
| + } |
| if (mouse_event.type == WebInputEvent::MouseDown || |
| mouse_event.type == WebInputEvent::MouseMove || |
| mouse_event.type == WebInputEvent::MouseUp) { |