| Index: content/browser/renderer_host/input/web_input_event_util.cc
|
| diff --git a/content/browser/renderer_host/input/web_input_event_util.cc b/content/browser/renderer_host/input/web_input_event_util.cc
|
| index 5994b7ffd6ad5ec99d337ce4f6aad98621e87332..d419802be9e32503a47accf8fee399f7d158b367 100644
|
| --- a/content/browser/renderer_host/input/web_input_event_util.cc
|
| +++ b/content/browser/renderer_host/input/web_input_event_util.cc
|
| @@ -11,6 +11,7 @@
|
|
|
| using blink::WebGestureEvent;
|
| using blink::WebInputEvent;
|
| +using blink::WebMouseEvent;
|
| using blink::WebTouchEvent;
|
| using blink::WebTouchPoint;
|
| using ui::MotionEvent;
|
| @@ -213,6 +214,46 @@ void UpdateWindowsKeyCodeAndKeyIdentifier(blink::WebKeyboardEvent* event,
|
| }
|
| }
|
|
|
| +blink::WebMouseEvent CreateWebMouseEventFromMotionEvent(
|
| + const ui::MotionEvent& event) {
|
| + blink::WebMouseEvent result;
|
| + result.type = WebInputEvent::MouseMove;
|
| + switch (event.GetAction()) {
|
| + case MotionEvent::ACTION_DOWN: {
|
| + result.type = WebInputEvent::MouseDown;
|
| + result.modifiers |= WebInputEvent::LeftButtonDown;
|
| + result.clickCount = 1;
|
| + break;
|
| + }
|
| + case MotionEvent::ACTION_UP:
|
| + case MotionEvent::ACTION_CANCEL: {
|
| + result.type = WebInputEvent::MouseUp;
|
| + result.clickCount = 1;
|
| + break;
|
| + }
|
| + case MotionEvent::ACTION_MOVE: {
|
| + result.type = WebInputEvent::MouseMove;
|
| + result.modifiers |= WebInputEvent::LeftButtonDown;
|
| + break;
|
| + }
|
| + default: {
|
| + }
|
| + }
|
| + result.timeStampSeconds =
|
| + (event.GetEventTime() - base::TimeTicks()).InSecondsF();
|
| + result.x = event.GetX();
|
| + result.y = event.GetY();
|
| + result.windowX = event.GetX();
|
| + result.windowY = event.GetY();
|
| +
|
| + if (result.type == WebInputEvent::MouseDown ||
|
| + result.type == WebInputEvent::MouseUp)
|
| + result.button = WebMouseEvent::ButtonLeft;
|
| + else
|
| + result.button = WebMouseEvent::ButtonNone;
|
| + return result;
|
| +}
|
| +
|
| blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
|
| const ui::MotionEvent& event) {
|
| blink::WebTouchEvent result;
|
|
|